agentic-devtools 0.2.107__tar.gz → 0.2.109__tar.gz

{agentic_devtools-0.2.107 → agentic_devtools-0.2.109}/.github/workflows/ai-pr-loop.yml

@@ -5,6 +5,8 @@ on:
     types: [opened, reopened]
   pull_request_review:
     types: [submitted]
+  issue_comment:
+    types: [created]
   workflow_run:
     workflows: ["Python Tests and Linting", "Lint", "Workflow Integration Tests"]
     types: [completed]
@@ -17,7 +19,7 @@ permissions:
 env:
   AGDT_USE_PYTHON_ORCHESTRATOR: "1"
 concurrency:
-  group: ai-pr-loop-${{ github.event.pull_request.number || github.event.workflow_run.pull_requests[0].number || github.run_id }}
+  group: ai-pr-loop-${{ github.event.pull_request.number || github.event.issue.number || github.event.workflow_run.pull_requests[0].number || github.run_id }}
   cancel-in-progress: false
 jobs:
   ai-pr-loop:
@@ -29,30 +31,55 @@ jobs:
        (github.event_name == 'pull_request_review' &&
         github.event.pull_request.head.repo.full_name == github.repository &&
         (github.event.review.user.login == 'Copilot' ||
-         github.event.review.user.login == 'copilot-pull-request-reviewer[bot]')) ||
+          github.event.review.user.login == 'copilot-pull-request-reviewer[bot]')) ||
+       (github.event_name == 'issue_comment' &&
+        github.event.issue.pull_request &&
+        (github.event.comment.user.login == 'copilot[bot]' ||
+         github.event.comment.user.login == 'Copilot' ||
+         github.event.comment.user.login == 'copilot-pull-request-reviewer[bot]')) ||
        (github.event_name == 'workflow_run' &&
         github.event.workflow_run.event == 'pull_request' &&
         github.event.workflow_run.head_repository.full_name == github.repository &&
         github.event.workflow_run.conclusion != 'cancelled' &&
         github.event.workflow_run.pull_requests[0].number != null))
     steps:
+      - name: Resolve PR head ref for issue_comment trigger
+        if: github.event_name == 'issue_comment'
+        id: issue-comment-pr
+        env:
+          GH_TOKEN: ${{ secrets.AGDT_PR_APPROVER_PAT }}
+        run: |
+          pr_json="$(gh pr view ${{ github.event.issue.number }} --repo ${{ github.repository }} --json headRefName,isCrossRepository)"
+          head_ref="$(echo "$pr_json" | jq -r '.headRefName')"
+          is_cross_repo="$(echo "$pr_json" | jq -r '.isCrossRepository')"
+          same_repo="$( [ "$is_cross_repo" = "true" ] && echo "false" || echo "true" )"
+          echo "head_ref=$head_ref" >> "$GITHUB_OUTPUT"
+          echo "same_repo=$same_repo" >> "$GITHUB_OUTPUT"
+      - name: Skip issue_comment from cross-repository PR
+        if: github.event_name == 'issue_comment' && steps.issue-comment-pr.outputs.same_repo != 'true'
+        run: echo "Skipping issue_comment event for cross-repository PR."
       - name: Checkout repository
+        if: github.event_name != 'issue_comment' || steps.issue-comment-pr.outputs.same_repo == 'true'
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.ref || github.event.workflow_run.head_branch }}
+          ref: ${{ github.event.pull_request.head.ref || github.event.workflow_run.head_branch || steps.issue-comment-pr.outputs.head_ref }}
           fetch-depth: 0
           token: ${{ secrets.AGDT_PR_APPROVER_PAT }}
       - name: Configure git identity
+        if: github.event_name != 'issue_comment' || steps.issue-comment-pr.outputs.same_repo == 'true'
         run: |
           git config user.name "acmarsn-agdt"
           git config user.email "269151600+acmarsn-agdt@users.noreply.github.com"
       - name: Set up Python
+        if: github.event_name != 'issue_comment' || steps.issue-comment-pr.outputs.same_repo == 'true'
         uses: actions/setup-python@v5
         with:
           python-version: '3.12'
       - name: Install agentic-devtools
+        if: github.event_name != 'issue_comment' || steps.issue-comment-pr.outputs.same_repo == 'true'
         run: pip install agentic-devtools
       - name: Run AI PR loop orchestrator
+        if: github.event_name != 'issue_comment' || steps.issue-comment-pr.outputs.same_repo == 'true'
         env:
           GH_TOKEN: ${{ secrets.AGDT_PR_APPROVER_PAT }}
           COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}

{agentic_devtools-0.2.107 → agentic_devtools-0.2.109}/.github/workflows/speckit-issue-trigger.yml

@@ -35,8 +35,7 @@ jobs:
         with:
           fetch-depth: 0
       - uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
+        with: { python-version: '3.12' }
       - run: |
           python -m pip install --upgrade pip
           python -m pip install . --no-deps

{agentic_devtools-0.2.107 → agentic_devtools-0.2.109}/PKG-INFO

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

{agentic_devtools-0.2.107 → agentic_devtools-0.2.109}/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.107'
-__version_tuple__ = version_tuple = (0, 2, 107)
+__version__ = version = '0.2.109'
+__version_tuple__ = version_tuple = (0, 2, 109)
 
 __commit_id__ = commit_id = None

{agentic_devtools-0.2.107 → agentic_devtools-0.2.109}/agentic_devtools/cli/ci/ado_provider.py

@@ -175,3 +175,14 @@ class AzureDevOpsProvider(CIPlatformProvider):
     ) -> None:
         """Not implemented for ADO stub."""
         raise NotImplementedError("AzureDevOpsProvider.finalize_post_repair() not yet implemented")
+
+    def squash_post_repair(
+        self,
+        *,
+        pr_number: int,
+        base_branch: str,
+        head_branch: str,
+        head_sha: str,
+    ) -> None:
+        """Not implemented for ADO stub."""
+        raise NotImplementedError("AzureDevOpsProvider.squash_post_repair() not yet implemented")

{agentic_devtools-0.2.107 → agentic_devtools-0.2.109}/agentic_devtools/cli/ci/github_provider.py

@@ -31,6 +31,9 @@ from agentic_devtools.cli.subprocess_utils import run_safe
 
 logger = logging.getLogger(__name__)
 
+_ADDRESSED_REPLY_BODY = "Addressed on the updated PR branch."
+_LEGACY_ADDRESSED_REPLY_PREFIXES = ("addressed by fix commit",)
+
 
 def _format_suppressed_body(body: str, max_length: int = 200) -> str:
     """Normalize/escape/truncate suppressed body for compact one-line trigger output."""
@@ -329,6 +332,8 @@ class GitHubActionsProvider(CIPlatformProvider):
                 return self._parse_pull_request_event(raw_payload)
             if event_name == "pull_request_review":
                 return self._parse_pull_request_review_event(raw_payload, event_name)
+            if event_name == "issue_comment":
+                return self._parse_issue_comment_event(raw_payload, event_name)
             if event_name == "issues":
                 return self._parse_issues_event(raw_payload)
             if event_name == "workflow_run":
@@ -373,6 +378,23 @@ class GitHubActionsProvider(CIPlatformProvider):
             sender_login=raw.get("sender", {}).get("login", ""),
         )
 
+    def _parse_issue_comment_event(self, raw: dict, event_name: str) -> EventPayload:
+        issue = raw.get("issue")
+        if issue is None:
+            raise MalformedEventError(event_name, "missing 'issue' field")
+        if issue.get("pull_request") is None:
+            raise MalformedEventError(event_name, "issue_comment is not on a pull request")
+        issue_number = issue.get("number")
+        if not isinstance(issue_number, int) or issue_number <= 0:
+            raise MalformedEventError(event_name, "missing or invalid 'issue.number' field")
+        commenter_login = raw.get("comment", {}).get("user", {}).get("login", "")
+        return EventPayload(
+            pr_number=issue_number,
+            action="comment_created",
+            repository_full_name=raw.get("repository", {}).get("full_name", ""),
+            sender_login=commenter_login or raw.get("sender", {}).get("login", ""),
+        )
+
     def _parse_workflow_run_event(self, raw: dict, event_name: str) -> EventPayload:
         wf = raw.get("workflow_run")
         if wf is None:
@@ -637,18 +659,12 @@ class GitHubActionsProvider(CIPlatformProvider):
         return [int(c["id"]) for c in comments if c.get("id")]
 
     @retry_with_backoff()
-    def _reply_to_review_comment(self, pr_number: int, comment_id: int, head_sha: str) -> None:
+    def _reply_to_review_comment(self, pr_number: int, comment_id: int) -> None:
         """Post addressed reply to a single review comment."""
-        repo = self._resolve_repo()
         _gh_api(
             self._repo_api(f"/pulls/{pr_number}/comments/{comment_id}/replies"),
             method="POST",
-            body={
-                "body": (
-                    f"Addressed by fix commit [`{head_sha[:8]}`]"
-                    f"(https://github.com/{repo}/commit/{head_sha})."
-                )
-            },
+            body={"body": _ADDRESSED_REPLY_BODY},
         )
 
     @retry_with_backoff()
@@ -663,7 +679,10 @@ class GitHubActionsProvider(CIPlatformProvider):
             int(comment["in_reply_to_id"])
             for comment in comments
             if comment.get("in_reply_to_id")
-            and str(comment.get("body", "")).strip().lower().startswith("addressed by fix commit")
+            and (
+                str(comment.get("body", "")).strip().lower() == _ADDRESSED_REPLY_BODY.lower()
+                or str(comment.get("body", "")).strip().lower().startswith(_LEGACY_ADDRESSED_REPLY_PREFIXES)
+            )
         }
 
     def _has_existing_addressed_reply(
@@ -1052,7 +1071,7 @@ class GitHubActionsProvider(CIPlatformProvider):
         head_branch: str,
         head_sha: str,
         reset_to_remote: bool = False,
-    ) -> str:
+    ) -> None:
         """Squash commits on head branch into one and force-push with lease."""
         self._run_git(["fetch", "origin", base_branch, head_branch])
         self._run_git(["checkout", head_branch])
@@ -1094,7 +1113,6 @@ class GitHubActionsProvider(CIPlatformProvider):
                 except RuntimeError as abort_exc:
                     raise RuntimeError(f"`git rebase --abort` failed: {abort_exc}") from abort_exc
         self._run_git(["push", "--force-with-lease", "origin", f"HEAD:{head_branch}"])
-        return self._run_git(["rev-parse", "HEAD"]).strip()
 
     def squash_before_publish(
         self,
@@ -1108,6 +1126,19 @@ class GitHubActionsProvider(CIPlatformProvider):
         logger.info("Squashing PR #%d before publish", pr_number)
         self._squash_and_force_push(base_branch=base_branch, head_branch=head_branch, head_sha=head_sha)
 
+    def count_commits_above_merge_base(
+        self,
+        *,
+        base_branch: str,
+        head_sha: str,
+    ) -> int:
+        """Return commit count above merge-base between origin/base and ``head_sha``."""
+        self._run_git(["fetch", "origin", base_branch])
+        self._run_git(["fetch", "origin", head_sha])
+        merge_base = self._run_git(["merge-base", head_sha, f"origin/{base_branch}"]).strip()
+        commit_count_raw = self._run_git(["rev-list", "--count", f"{merge_base}..{head_sha}"]).strip()
+        return int(commit_count_raw or "0")
+
     def _resolve_repo(self) -> str:
         """Resolve the repository in ``owner/repo`` format."""
         repo = self._repo or os.environ.get("GITHUB_REPOSITORY", "")
@@ -1124,36 +1155,18 @@ class GitHubActionsProvider(CIPlatformProvider):
         head_sha: str,
         review_id: int,
     ) -> None:
-        """Finalize a post-repair cycle after Copilot pushes a fix commit.
+        """Perform soft post-repair finalization after Copilot pushes a fix commit.
 
         Each sub-operation is individually retried so that a transient failure
         partway through does not re-execute already-completed steps (addresses
         the non-idempotent retry concern).
 
-        Delegates thread resolution and Copilot re-request to the existing
-        ``cli/github`` modules to avoid duplicating GraphQL pagination,
-        verification, and retry logic.
+        Delegates thread resolution to the existing ``cli/github`` module to
+        avoid duplicating GraphQL pagination and retry logic.
         """
         repo = self._resolve_repo()
 
-        # 1. Squash and force-push
-        post_squash_head_sha = self._squash_and_force_push(
-            base_branch=base_branch,
-            head_branch=head_branch,
-            head_sha=head_sha,
-        )
-
-        # 1b. Guard against the race where Copilot SWE agent pushes another
-        #     commit during finalization — re-fetch and hard-reset to remote
-        #     head branch before re-checking commit count.
-        post_squash_head_sha = self._squash_and_force_push(
-            base_branch=base_branch,
-            head_branch=head_branch,
-            head_sha=head_sha,
-            reset_to_remote=True,
-        )
-
-        # 2. Reply to each review comment (individually retried via decorator)
+        # 1. Reply to each review comment (individually retried via decorator)
         comment_ids = self._list_review_comment_ids(pr_number, review_id)
         addressed_reply_parent_comment_ids = set()
         if comment_ids:
@@ -1161,17 +1174,44 @@ class GitHubActionsProvider(CIPlatformProvider):
         for comment_id in comment_ids:
             if self._has_existing_addressed_reply(pr_number, comment_id, addressed_reply_parent_comment_ids):
                 continue
-            self._reply_to_review_comment(pr_number, comment_id, post_squash_head_sha)
+            self._reply_to_review_comment(pr_number, comment_id)
 
-        # 3. Resolve threads — delegates to existing resolve_review_threads()
+        # 2. Resolve threads — delegates to existing resolve_review_threads()
         #    which already handles GraphQL pagination, retry, and verification
         _resolve_review_threads(pr_number, repo, review_id=review_id)
 
-        # 4. Ensure PR is published if still draft (edge-case safety)
+    def squash_post_repair(
+        self,
+        *,
+        pr_number: int,
+        base_branch: str,
+        head_branch: str,
+        head_sha: str,
+    ) -> None:
+        """Squash post-repair commits and re-request Copilot review.
+
+        Called from the comment-triggered post-repair phase after the
+        Copilot coding agent session has completed.
+        """
+        # 1. Squash and force-push
+        self._squash_and_force_push(base_branch=base_branch, head_branch=head_branch, head_sha=head_sha)
+
+        # 1b. Guard against the race where Copilot SWE agent pushes another
+        #     commit during finalization — re-fetch and hard-reset to remote
+        #     head branch before re-checking commit count.
+        self._squash_and_force_push(
+            base_branch=base_branch,
+            head_branch=head_branch,
+            head_sha=head_sha,
+            reset_to_remote=True,
+        )
+
+        # 2. Ensure PR is published if still draft (edge-case safety)
         pr_meta = self.get_pr_metadata(pr_number)
         if pr_meta.is_draft:
             self.publish_pr(pr_number)
 
-        # 5. Re-request Copilot review — delegates to existing module which
+        # 3. Re-request Copilot review — delegates to existing module which
         #    handles POST + exponential backoff verification + reviews fallback
+        repo = self._resolve_repo()
         _request_copilot_review(pr_number, repo)

{agentic_devtools-0.2.107 → agentic_devtools-0.2.109}/agentic_devtools/cli/ci/models.py

@@ -111,6 +111,8 @@ class ReviewInfo:
 # Copilot login names used in review detection (provider-agnostic)
 COPILOT_REVIEWER_LOGIN = "copilot-pull-request-reviewer[bot]"
 COPILOT_LOGINS = frozenset({"Copilot", COPILOT_REVIEWER_LOGIN})
+# All Copilot identities that may leave comments (superset of COPILOT_LOGINS)
+COPILOT_COMMENT_LOGINS = frozenset({"copilot[bot]", "Copilot", COPILOT_REVIEWER_LOGIN})
 
 
 @dataclass(frozen=True)

{agentic_devtools-0.2.107 → agentic_devtools-0.2.109}/agentic_devtools/cli/ci/orchestrator.py

@@ -20,6 +20,7 @@ import sys
 from typing import Any
 
 from agentic_devtools.cli.ci.guards import (
+    LABEL_NO_AUTO_MERGE,
     LABEL_SKIP_ENTIRELY,
     PRIVILEGED_PREFIXES,
     check_cycle_limit,
@@ -31,6 +32,7 @@ from agentic_devtools.cli.ci.guards import (
     increment_cycle_count,
 )
 from agentic_devtools.cli.ci.models import (
+    COPILOT_COMMENT_LOGINS,
     COPILOT_LOGINS,
     COPILOT_REVIEWER_LOGIN,
     CheckRunStatus,
@@ -103,6 +105,7 @@ _DEFAULT_ACTIONABLE_CHECK_NAMES = frozenset(
         "Tests ✅",
         "Markdown Lint ✅",
         "Workflow Tests ✅",
+        "Code scanning results / CodeQL",
     }
 )
 
@@ -117,6 +120,63 @@ def _is_review_submission_event(event_payload: EventPayload) -> bool:
     return event_payload.action == "submitted"
 
 
+def _is_issue_comment_created(event_payload: EventPayload) -> bool:
+    """Return True when this run was triggered by an ``issue_comment`` create event."""
+    return event_payload.action == "comment_created"
+
+
+def _count_commits_above_merge_base(
+    provider: CIPlatformProvider,
+    *,
+    base_branch: str,
+    head_sha: str,
+) -> int:
+    """Return commit count above merge-base, defaulting to 1 when unsupported."""
+    counter = getattr(provider, "count_commits_above_merge_base", None)
+    if not callable(counter):
+        logger.info("Provider does not expose commit-count probe; treating post-repair squash as not needed")
+        return 1
+    count = counter(base_branch=base_branch, head_sha=head_sha)
+    return int(count)
+
+
+def _apply_comment_triggered_post_repair_guards(
+    pr_number: int,
+    pr_meta: PRMetadata,
+    summary: dict[str, Any],
+) -> int | None:
+    """Apply fail-closed guards before comment-triggered post-repair squash."""
+    if check_fork_pr(pr_meta.head_repo_full_name, pr_meta.base_repo_full_name):
+        logger.info(
+            "PR #%d comment-triggered post-repair squash blocked for fork PR (head=%s, base=%s)",
+            pr_number,
+            pr_meta.head_repo_full_name,
+            pr_meta.base_repo_full_name,
+        )
+        summary["guards"] = {"blocked_by": "fork_pr"}
+        summary["decision"] = "blocked"
+        summary["reason"] = "fork_pr"
+        summary["exit_code"] = EXIT_GUARD_BLOCKED
+        return EXIT_GUARD_BLOCKED
+
+    should_skip, flag = check_exclusion_labels(pr_meta.labels)
+    if should_skip or flag == "do_not_merge":
+        blocked_by = "exclusion_label" if should_skip else "do_not_merge"
+        label = LABEL_SKIP_ENTIRELY if should_skip else LABEL_NO_AUTO_MERGE
+        logger.info(
+            "PR #%d comment-triggered post-repair squash blocked by label guard (%s)",
+            pr_number,
+            label,
+        )
+        summary["guards"] = {"blocked_by": blocked_by, "label": label}
+        summary["decision"] = "blocked"
+        summary["reason"] = blocked_by
+        summary["exit_code"] = EXIT_GUARD_BLOCKED
+        return EXIT_GUARD_BLOCKED
+
+    return None
+
+
 def _is_wip_title(title: str) -> bool:
     """Return True when a PR title is explicitly marked work-in-progress."""
     return title.upper().startswith("[WIP]")
@@ -268,6 +328,127 @@ def run_ai_pr_loop(
     logger.info("PR #%d metadata resolved: head_sha=%s, base=%s", pr_number, pr_meta.head_sha, pr_meta.base_branch)
     _log_endgroup()
 
+    # Step 2b: Comment-triggered deferred post-repair squash finalization.
+    # This path intentionally skips merge-only logic, but still re-applies
+    # fork/label guards before any force-push behavior.
+    if _is_issue_comment_created(event_payload):
+        _log_group("Step 2b: Post-repair squash finalization")
+        summary["post_repair"] = {"phase": "comment_triggered"}
+        sender_login = event_payload.sender_login
+        if not sender_login or sender_login not in COPILOT_COMMENT_LOGINS:
+            summary["decision"] = "post_repair_squash_not_needed"
+            summary["reason"] = "non_copilot_comment"
+            summary["exit_code"] = EXIT_SUCCESS
+            _log_endgroup()
+            _emit_decision_summary(summary)
+            return EXIT_SUCCESS
+
+        guard_exit = _apply_comment_triggered_post_repair_guards(pr_number, pr_meta, summary)
+        if guard_exit is not None:
+            _log_endgroup()
+            _emit_decision_summary(summary)
+            return guard_exit
+
+        try:
+            reviews = provider.list_reviews(pr_number)
+        except Exception as exc:
+            logger.error("Failed to list reviews for PR #%d during comment finalization: %s", pr_number, exc)
+            summary["decision"] = "error"
+            summary["reason"] = "reviews_listing_failed"
+            summary["error"] = str(exc)
+            summary["exit_code"] = EXIT_METADATA_FAILED
+            _log_endgroup()
+            _emit_decision_summary(summary)
+            return EXIT_METADATA_FAILED
+
+        prior_copilot_reviews = [
+            r
+            for r in reviews
+            if r.user in COPILOT_LOGINS
+            and r.commit_sha
+            and r.commit_sha != pr_meta.head_sha
+            and r.state in ("CHANGES_REQUESTED", "COMMENTED")
+        ]
+        prior_review_id = 0
+        if prior_copilot_reviews:
+            prior_copilot_reviews.sort(key=lambda r: r.id, reverse=True)
+            prior_review = prior_copilot_reviews[0]
+            if prior_review.state == "CHANGES_REQUESTED":
+                prior_review_id = prior_review.id
+            else:
+                try:
+                    if provider.list_review_comments(pr_number, prior_review.id):
+                        prior_review_id = prior_review.id
+                except Exception:
+                    # Fail closed when comments cannot be fetched.
+                    prior_review_id = prior_review.id
+
+        if not prior_review_id:
+            summary["decision"] = "post_repair_squash_not_needed"
+            summary["reason"] = "no_prior_actionable_review"
+            summary["exit_code"] = EXIT_SUCCESS
+            _log_endgroup()
+            _emit_decision_summary(summary)
+            return EXIT_SUCCESS
+
+        try:
+            commit_count = _count_commits_above_merge_base(
+                provider,
+                base_branch=pr_meta.base_branch,
+                head_sha=pr_meta.head_sha,
+            )
+        except Exception as exc:
+            logger.error("Failed to count post-repair commits for PR #%d: %s", pr_number, exc)
+            summary["decision"] = "error"
+            summary["reason"] = "post_repair_commit_count_failed"
+            summary["error"] = str(exc)
+            summary["exit_code"] = EXIT_METADATA_FAILED
+            _log_endgroup()
+            _emit_decision_summary(summary)
+            return EXIT_METADATA_FAILED
+
+        if commit_count <= 1:
+            summary["post_repair"] = {
+                "phase": "comment_triggered",
+                "review_id": prior_review_id,
+                "commit_count": commit_count,
+            }
+            summary["decision"] = "post_repair_squash_not_needed"
+            summary["reason"] = "already_squashed_or_single_commit"
+            summary["exit_code"] = EXIT_SUCCESS
+            _log_endgroup()
+            _emit_decision_summary(summary)
+            return EXIT_SUCCESS
+
+        try:
+            provider.squash_post_repair(
+                pr_number=pr_number,
+                base_branch=pr_meta.base_branch,
+                head_branch=pr_meta.head_branch,
+                head_sha=pr_meta.head_sha,
+            )
+        except Exception as exc:
+            logger.error("Post-repair squash finalization failed for PR #%d: %s", pr_number, exc)
+            summary["decision"] = "error"
+            summary["reason"] = "post_repair_squash_failed"
+            summary["error"] = str(exc)
+            summary["exit_code"] = EXIT_MERGE_BLOCKED
+            _log_endgroup()
+            _emit_decision_summary(summary)
+            return EXIT_MERGE_BLOCKED
+
+        summary["post_repair"] = {
+            "phase": "comment_triggered",
+            "review_id": prior_review_id,
+            "commit_count": commit_count,
+            "squashed": True,
+        }
+        summary["decision"] = "post_repair_squash_completed"
+        summary["exit_code"] = EXIT_SUCCESS
+        _log_endgroup()
+        _emit_decision_summary(summary)
+        return EXIT_SUCCESS
+
     # Step 3: Evaluate guards
     _log_group("Step 3: Evaluate guards")
 
@@ -647,7 +828,7 @@ def run_ai_pr_loop(
                 _emit_decision_summary(summary)
                 return EXIT_MERGE_BLOCKED
             summary["post_repair"] = {"finalized": True, "review_id": copilot_review_id}
-            summary["decision"] = "post_repair_finalized"
+            summary["decision"] = "post_repair_soft_finalized"
             summary["exit_code"] = EXIT_SUCCESS
             _log_endgroup()
             _emit_decision_summary(summary)
@@ -656,7 +837,7 @@ def run_ai_pr_loop(
         # No actionable review on HEAD — check for an actionable Copilot review
         # on a prior commit.  When Copilot SWE agent pushes a repair commit the
         # review that triggered the repair targets the old SHA.  After CI passes
-        # on the new HEAD we must still finalize (reply, resolve, squash).
+        # on the new HEAD we must still soft-finalize (reply, resolve).
         prior_copilot_reviews = [
             r
             for r in reviews
@@ -714,7 +895,7 @@ def run_ai_pr_loop(
                     "review_id": prior_review_id,
                     "prior_commit": True,
                 }
-                summary["decision"] = "post_repair_finalized"
+                summary["decision"] = "post_repair_soft_finalized"
                 summary["exit_code"] = EXIT_SUCCESS
                 _log_endgroup()
                 _emit_decision_summary(summary)

{agentic_devtools-0.2.107 → agentic_devtools-0.2.109}/agentic_devtools/cli/ci/provider.py

@@ -238,6 +238,22 @@ class CIPlatformProvider(ABC):
         """Finalize a Copilot-repaired PR cycle after a synchronize commit.
 
         Performs provider-specific post-repair actions such as replying to
-        review comments, resolving review threads, squashing branch commits,
-        force-pushing the squashed commit, and re-requesting Copilot review.
+        review comments and resolving review threads. Squash + re-request
+        are handled separately via ``squash_post_repair()``.
+        """
+
+    @abstractmethod
+    def squash_post_repair(
+        self,
+        *,
+        pr_number: int,
+        base_branch: str,
+        head_branch: str,
+        head_sha: str,
+    ) -> None:
+        """Squash post-repair commits and re-request review.
+
+        Called after the Copilot coding agent session has completed
+        (signaled by a comment event) to avoid race conditions with
+        the agent's force-push.
         """

agentic_devtools-0.2.109/tests/fixtures/ci_events/issue_comment_created.json

@@ -0,0 +1,22 @@
+{
+  "action": "created",
+  "issue": {
+    "number": 42,
+    "pull_request": {
+      "url": "https://api.github.com/repos/owner/repo/pulls/42"
+    }
+  },
+  "comment": {
+    "id": 123456789,
+    "user": {
+      "login": "copilot[bot]"
+    },
+    "body": "Addressed in abc123def"
+  },
+  "repository": {
+    "full_name": "owner/repo"
+  },
+  "sender": {
+    "login": "copilot[bot]"
+  }
+}

{agentic_devtools-0.2.107 → agentic_devtools-0.2.109}/tests/unit/cli/ci/ado_provider/test_azuredevopsprovider.py

@@ -113,6 +113,13 @@ class TestAzureDevOpsProvider:
                 head_sha="abc123",
                 review_id=1,
             )
+        with pytest.raises(NotImplementedError):
+            provider.squash_post_repair(
+                pr_number=1,
+                base_branch="main",
+                head_branch="feature/test",
+                head_sha="abc123",
+            )
 
     def test_malformed_payload_raises_error(self) -> None:
         """Payload that causes TypeError/ValueError raises MalformedEventError."""

{agentic_devtools-0.2.107 → agentic_devtools-0.2.109}/tests/unit/cli/ci/github_provider/test__list_addressed_reply_parent_comment_ids.py

@@ -12,11 +12,13 @@ def test__list_addressed_reply_parent_comment_ids_filters_addressed_replies(mock
     mock_parse.return_value = [
         {"in_reply_to_id": 10, "body": "Addressed by fix commit `abc12345`."},
         {"in_reply_to_id": "20", "body": "  ADDRESSED BY FIX COMMIT `def67890`."},
-        {"in_reply_to_id": 25, "body": "not addressed by fix commit"},
+        {"in_reply_to_id": 25, "body": "Addressed on the updated PR branch."},
+        {"in_reply_to_id": 27, "body": "  addressed on the updated pr branch.  "},
+        {"in_reply_to_id": 28, "body": "not addressed by fix commit"},
         {"in_reply_to_id": 30, "body": "Not addressed yet"},
-        {"body": "Addressed by fix commit `fedcba98`."},
+        {"body": "Addressed on the updated PR branch."},
     ]
     provider = GitHubActionsProvider(repo="owner/repo")
 
-    assert provider._list_addressed_reply_parent_comment_ids(42) == {10, 20}
+    assert provider._list_addressed_reply_parent_comment_ids(42) == {10, 20, 25, 27}
     mock_gh_api.assert_called_once_with("/repos/owner/repo/pulls/42/comments", paginate=True)