From 698c61d971125303922efcf6926546d7eae42136 Mon Sep 17 00:00:00 2001
From: Alexander Lanin <Alexander.Lanin@etas.com>
Date: Fri, 11 Sep 2026 06:09:19 +0200
Subject: [PATCH 1/3] feat(repo-policy-sync): record tool checkout revision

---
 repo_policy_sync/src/github.py             | 41 ++++++++++++++++
 repo_policy_sync/templates/pull_request.md |  4 ++
 repo_policy_sync/tests/test_github.py      | 56 +++++++++++++++++++++-
 3 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/repo_policy_sync/src/github.py b/repo_policy_sync/src/github.py
index a323e0c..260d810 100644
--- a/repo_policy_sync/src/github.py
+++ b/repo_policy_sync/src/github.py
@@ -785,6 +785,46 @@ def _pull_request_number(url: str) -> int:
     return int(match.group(1))
 
 
+def _tool_revision() -> str:
+    """Return the current checkout's short commit hash and dirty marker."""
+
+    try:
+        revision_result = subprocess.run(
+            ["git", "rev-parse", "--short", "HEAD"],
+            check=True,
+            capture_output=True,
+            text=True,
+        )
+    except FileNotFoundError as exc:
+        raise CommandError("required command is unavailable: git") from exc
+    except subprocess.CalledProcessError as exc:
+        detail = exc.stderr.strip() or exc.stdout.strip() or "command failed"
+        raise CommandError(f"git rev-parse --short HEAD: {detail}") from exc
+
+    revision = revision_result.stdout.strip()
+    if not revision:
+        raise CommandError("git rev-parse --short HEAD returned no commit hash")
+
+    try:
+        dirty_result = subprocess.run(
+            ["git", "diff-index", "--quiet", "HEAD", "--"],
+            check=False,
+            capture_output=True,
+            text=True,
+        )
+    except FileNotFoundError as exc:  # pragma: no cover - guarded by rev-parse
+        raise CommandError("required command is unavailable: git") from exc
+
+    if dirty_result.returncode not in (0, 1):
+        detail = (
+            dirty_result.stderr.strip()
+            or dirty_result.stdout.strip()
+            or "command failed"
+        )
+        raise CommandError(f"git diff-index --quiet HEAD --: {detail}")
+    return f"{revision}-dirty" if dirty_result.returncode == 1 else revision
+
+
 def _pull_request_body(
     policy: Policy,
     changes: tuple[Change, ...],
@@ -815,6 +855,7 @@ def _pull_request_body(
         "policy_description": description,
         "policy_trigger": _policy_trigger(policy, changes),
         "changes": change_lines,
+        "tool_revision": _tool_revision(),
         "failure_section": _failure_section(failure),
     }
     for key, value in values.items():
diff --git a/repo_policy_sync/templates/pull_request.md b/repo_policy_sync/templates/pull_request.md
index 74c1146..06ae315 100644
--- a/repo_policy_sync/templates/pull_request.md
+++ b/repo_policy_sync/templates/pull_request.md
@@ -25,6 +25,10 @@
 
 {{ changes }}
 
+## Tool revision
+
+Generated from commit `{{ tool_revision }}` in the checkout where the tool was run.
+
 {{ failure_section }}
 
 ---
diff --git a/repo_policy_sync/tests/test_github.py b/repo_policy_sync/tests/test_github.py
index 4e9b92e..c96d912 100644
--- a/repo_policy_sync/tests/test_github.py
+++ b/repo_policy_sync/tests/test_github.py
@@ -23,6 +23,7 @@
     GitHubCli,
     PullRequest,
     _pull_request_body,
+    _tool_revision,
     policy_branches,
 )
 from repo_policy_sync.src.errors import CommandError, redact_sensitive_text
@@ -611,7 +612,10 @@ def run(command: list[str]) -> str:
     assert commands[1][:4] == ["gh", "pr", "create", "--draft"]
 
 
-def test_pull_request_template_explains_policy_trigger_and_changes() -> None:
+def test_pull_request_template_explains_policy_trigger_and_changes(monkeypatch) -> None:
+    monkeypatch.setattr(
+        "repo_policy_sync.src.github._tool_revision", lambda: "abc1234-dirty"
+    )
     policy = Policy(
         "score-docs-as-code.cleanup",
         "Update docs files",
@@ -633,12 +637,62 @@ def test_pull_request_template_explains_policy_trigger_and_changes() -> None:
     )
     assert "`MODULE.bazel` declares the required direct Bazel dependency" in body
     assert "- `.gitignore`: add '_build'" in body
+    assert (
+        "Generated from commit `abc1234-dirty` in the checkout where the tool was run."
+        in body
+    )
     assert body.index("## Policy") < body.index("<!-- repo-policy-sync-policy:")
     assert body.index("<!-- repo-policy-sync-policy:") < body.index(
         "<!-- repo-policy-sync-head:"
     )
 
 
+def test_tool_revision_reports_a_clean_short_commit_hash(monkeypatch) -> None:
+    def run(command, **kwargs):
+        assert kwargs["capture_output"] is True
+        assert kwargs["text"] is True
+        if command == ["git", "rev-parse", "--short", "HEAD"]:
+            return subprocess.CompletedProcess(
+                command, 0, stdout="abc1234\n", stderr=""
+            )
+        if command == ["git", "diff-index", "--quiet", "HEAD", "--"]:
+            return subprocess.CompletedProcess(command, 0, stdout="", stderr="")
+        raise AssertionError(command)
+
+    monkeypatch.setattr("repo_policy_sync.src.github.subprocess.run", run)
+
+    assert _tool_revision() == "abc1234"
+
+
+def test_tool_revision_marks_a_dirty_checkout(monkeypatch) -> None:
+    def run(command, **kwargs):
+        if command == ["git", "rev-parse", "--short", "HEAD"]:
+            return subprocess.CompletedProcess(
+                command, 0, stdout="abc1234\n", stderr=""
+            )
+        if command == ["git", "diff-index", "--quiet", "HEAD", "--"]:
+            return subprocess.CompletedProcess(command, 1, stdout="", stderr="")
+        raise AssertionError(command)
+
+    monkeypatch.setattr("repo_policy_sync.src.github.subprocess.run", run)
+
+    assert _tool_revision() == "abc1234-dirty"
+
+
+def test_tool_revision_rejects_missing_git_metadata(monkeypatch) -> None:
+    def run(*_: object, **__: object) -> None:
+        raise subprocess.CalledProcessError(
+            128,
+            ["git", "rev-parse", "--short", "HEAD"],
+            stderr="fatal: not a git repository\n",
+        )
+
+    monkeypatch.setattr("repo_policy_sync.src.github.subprocess.run", run)
+
+    with pytest.raises(CommandError, match="not a git repository"):
+        _tool_revision()
+
+
 def test_module_policy_pull_request_includes_the_matching_rationale() -> None:
     policy = load_policy(
         BUNDLED_POLICY_DIRECTORY / "minimal-bazel-module-declaration" / "policy.yml"

From b78d0f62d0fc8b5bef2ddaa58706855b40e2020c Mon Sep 17 00:00:00 2001
From: Alexander Lanin <Alexander.Lanin@etas.com>
Date: Fri, 11 Sep 2026 06:13:11 +0200
Subject: [PATCH 2/3] docs(repo-policy-sync): identify tool repository

---
 repo_policy_sync/templates/pull_request.md | 2 +-
 repo_policy_sync/tests/test_github.py      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/repo_policy_sync/templates/pull_request.md b/repo_policy_sync/templates/pull_request.md
index 06ae315..23beb8c 100644
--- a/repo_policy_sync/templates/pull_request.md
+++ b/repo_policy_sync/templates/pull_request.md
@@ -27,7 +27,7 @@
 
 ## Tool revision
 
-Generated from commit `{{ tool_revision }}` in the checkout where the tool was run.
+Generated from [eclipse-score/tools](https://github.com/eclipse-score/tools) at commit `{{ tool_revision }}`.
 
 {{ failure_section }}
 
diff --git a/repo_policy_sync/tests/test_github.py b/repo_policy_sync/tests/test_github.py
index c96d912..48d5d4a 100644
--- a/repo_policy_sync/tests/test_github.py
+++ b/repo_policy_sync/tests/test_github.py
@@ -638,8 +638,8 @@ def test_pull_request_template_explains_policy_trigger_and_changes(monkeypatch)
     assert "`MODULE.bazel` declares the required direct Bazel dependency" in body
     assert "- `.gitignore`: add '_build'" in body
     assert (
-        "Generated from commit `abc1234-dirty` in the checkout where the tool was run."
-        in body
+        "Generated from [eclipse-score/tools](https://github.com/eclipse-score/tools) "
+        "at commit `abc1234-dirty`." in body
     )
     assert body.index("## Policy") < body.index("<!-- repo-policy-sync-policy:")
     assert body.index("<!-- repo-policy-sync-policy:") < body.index(

From cdfb94a6068ff79318bba5fac490a7d17649a539 Mon Sep 17 00:00:00 2001
From: Alexander Lanin <Alexander.Lanin@etas.com>
Date: Fri, 11 Sep 2026 10:50:12 +0200
Subject: [PATCH 3/3] fix(repo-policy-sync): resolve revision before apply

---
 repo_policy_sync/src/github.py        | 14 ++++++--
 repo_policy_sync/src/runner.py        | 40 ++++++++++++++++++++++-
 repo_policy_sync/tests/test_github.py | 23 ++++++++++----
 repo_policy_sync/tests/test_runner.py | 46 +++++++++++++++++++++++++--
 4 files changed, 111 insertions(+), 12 deletions(-)

diff --git a/repo_policy_sync/src/github.py b/repo_policy_sync/src/github.py
index 260d810..9fa2ff0 100644
--- a/repo_policy_sync/src/github.py
+++ b/repo_policy_sync/src/github.py
@@ -513,6 +513,7 @@ def create_pull_request(
         changes: tuple[Change, ...],
         head_oid: str,
         draft: bool = False,
+        tool_revision: str,
     ) -> PullRequest:
         self._ensure_automation_labels(repository=repository)
         create_command = [
@@ -528,7 +529,12 @@ def create_pull_request(
             "--title",
             policy.title,
             "--body",
-            _pull_request_body(policy, changes, head_oid=head_oid),
+            _pull_request_body(
+                policy,
+                changes,
+                head_oid=head_oid,
+                tool_revision=tool_revision,
+            ),
         ]
         if draft:
             create_command.insert(3, "--draft")
@@ -642,6 +648,7 @@ def update_pull_request(
         changes: tuple[Change, ...],
         head_oid: str,
         failure: str | None = None,
+        tool_revision: str,
     ) -> None:
         """Keep an existing policy-owned pull request's explanation current."""
 
@@ -658,7 +665,7 @@ def update_pull_request(
                 "-f",
                 f"title={policy.title}",
                 "-f",
-                f"body={_pull_request_body(policy, changes, head_oid=head_oid, failure=failure)}",
+                f"body={_pull_request_body(policy, changes, head_oid=head_oid, failure=failure, tool_revision=tool_revision)}",
             ]
         )
 
@@ -830,6 +837,7 @@ def _pull_request_body(
     changes: tuple[Change, ...],
     *,
     head_oid: str,
+    tool_revision: str,
     failure: str | None = None,
 ) -> str:
     """Build the concise, policy-centred pull-request template."""
@@ -855,7 +863,7 @@ def _pull_request_body(
         "policy_description": description,
         "policy_trigger": _policy_trigger(policy, changes),
         "changes": change_lines,
-        "tool_revision": _tool_revision(),
+        "tool_revision": tool_revision,
         "failure_section": _failure_section(failure),
     }
     for key, value in values.items():
diff --git a/repo_policy_sync/src/runner.py b/repo_policy_sync/src/runner.py
index 2a82a59..9ef1695 100644
--- a/repo_policy_sync/src/runner.py
+++ b/repo_policy_sync/src/runner.py
@@ -36,6 +36,7 @@
     PolicyPullRequestStatus,
     TOOL_SLUG,
     _pull_request_body,
+    _tool_revision,
     policy_branches,
 )
 from .models import Change, Policy, Repository
@@ -107,6 +108,7 @@ def create_pull_request(
         changes: tuple[Change, ...],
         head_oid: str,
         draft: bool = False,
+        tool_revision: str,
     ) -> object: ...
 
     def update_pull_request(
@@ -118,6 +120,7 @@ def update_pull_request(
         changes: tuple[Change, ...],
         head_oid: str,
         failure: str | None = None,
+        tool_revision: str,
     ) -> None: ...
 
     def close_pull_request(self, *, repository: str, pull_request: object) -> None: ...
@@ -187,6 +190,7 @@ def run_policies(
     policy_workers: int = DEFAULT_POLICY_WORKERS,
     progress: Callable[[str], None] | None = None,
     include_pull_request_status: bool = False,
+    tool_revision: str | None = None,
 ) -> RunReport:
     """Synchronize repositories, then process each policy across repositories in parallel.
 
@@ -198,6 +202,10 @@ def run_policies(
         raise RepoPolicySyncError("policy worker count must be at least 1")
     if recreate and not apply:
         raise RepoPolicySyncError("--recreate requires apply mode")
+    if apply and tool_revision is None:
+        # Resolve provenance before repository synchronization or any policy
+        # branch can be changed remotely by the apply workflow.
+        tool_revision = _tool_revision()
     started = monotonic()
     report_progress = progress or _write_progress
     try:
@@ -251,6 +259,7 @@ def run_policies(
             workers=policy_workers,
             progress=report_progress,
             include_pull_request_status=include_pull_request_status,
+            tool_revision=tool_revision,
         )
         outcomes.extend(policy_outcomes)
         for outcome in policy_outcomes:
@@ -324,6 +333,7 @@ def _run_policy_across_repositories(
     workers: int,
     progress: Callable[[str], None],
     include_pull_request_status: bool,
+    tool_revision: str | None,
 ) -> tuple[RepositoryOutcome, ...]:
     """Evaluate or apply one policy in independent repository checkouts concurrently."""
 
@@ -358,6 +368,7 @@ def _run_policy_across_repositories(
                     recreate=recreate,
                     allow_dirty_pr=allow_dirty_pr,
                     include_pull_request_status=include_pull_request_status,
+                    tool_revision=tool_revision,
                 )
             ] = (index, repository)
         for completed, future in enumerate(as_completed(futures), start=1):
@@ -390,6 +401,7 @@ def _run_policy_in_repository(
     recreate: bool,
     allow_dirty_pr: bool,
     include_pull_request_status: bool,
+    tool_revision: str | None,
 ) -> RepositoryOutcome:
     restore_synced_default_branch(checkout=checkout)
     if (
@@ -407,6 +419,7 @@ def _run_policy_in_repository(
         recreate=recreate,
         allow_dirty_pr=allow_dirty_pr,
         include_pull_request_status=include_pull_request_status,
+        tool_revision=tool_revision,
     )
 
 
@@ -422,7 +435,12 @@ def _run_repository(
     recreate: bool = False,
     allow_dirty_pr: bool = False,
     include_pull_request_status: bool = False,
+    tool_revision: str | None = None,
 ) -> RepositoryOutcome:
+    if apply and tool_revision is None:
+        # Keep direct private callers safe as well as the organization-level
+        # entry point: provenance must be known before branch mutation.
+        tool_revision = _tool_revision()
     full_name = f"{org}/{repository}"
     policy_pr_status = (
         _find_policy_pull_request_status(
@@ -461,6 +479,7 @@ def _run_repository(
                         changes=(),
                         head_oid=existing_pr.expected_head_oid,
                         failure=str(exc),
+                        tool_revision=tool_revision,
                     )
                     client.close_pull_request(
                         repository=full_name, pull_request=existing_pr
@@ -508,6 +527,7 @@ def _run_repository(
             policy=policy,
             checkout=checkout,
             allow_dirty_pr=allow_dirty_pr,
+            tool_revision=tool_revision,
         )
     if not evaluation.changes:
         existing_pr = (
@@ -615,6 +635,7 @@ def _run_repository(
                     changes=evaluation.changes,
                     head_oid=existing_pr.expected_head_oid,
                     failure=str(exc),
+                    tool_revision=tool_revision,
                 )
                 client.close_pull_request(
                     repository=full_name, pull_request=existing_pr
@@ -637,12 +658,14 @@ def _run_repository(
                     existing_pr=existing_pr,
                     changes=evaluation.changes,
                     allow_dirty_pr=allow_dirty_pr,
+                    tool_revision=tool_revision,
                 )
             if _pull_request_body_changed(
                 existing_pr,
                 policy=policy,
                 changes=evaluation.changes,
                 head_oid=existing_pr.expected_head_oid,
+                tool_revision=tool_revision,
             ):
                 client.update_pull_request(
                     repository=full_name,
@@ -650,6 +673,7 @@ def _run_repository(
                     policy=policy,
                     changes=evaluation.changes,
                     head_oid=existing_pr.expected_head_oid,
+                    tool_revision=tool_revision,
                 )
                 return RepositoryOutcome(
                     repository,
@@ -686,6 +710,7 @@ def _run_repository(
             changes=applied.changes,
             head_oid=head_oid,
             draft=pre_commit_failure is not None,
+            tool_revision=tool_revision,
         )
         if pre_commit_failure is not None:
             _comment_dirty_pull_request(
@@ -710,6 +735,7 @@ def _run_repository(
         policy=policy,
         changes=applied.changes,
         head_oid=head_oid,
+        tool_revision=tool_revision,
     )
     if pre_commit_failure is not None:
         _mark_dirty_pull_request(
@@ -796,11 +822,17 @@ def _pull_request_body_changed(
     policy: Policy,
     changes: tuple[Change, ...],
     head_oid: str,
+    tool_revision: str,
 ) -> bool:
     """Return whether the generated explanation differs from the PR body."""
 
     body = getattr(pull_request, "body", None)
-    return body != _pull_request_body(policy, changes, head_oid=head_oid)
+    return body != _pull_request_body(
+        policy,
+        changes,
+        head_oid=head_oid,
+        tool_revision=tool_revision,
+    )
 
 
 def _commit_result_parts(result: CommitResult) -> tuple[str, str | None]:
@@ -833,6 +865,7 @@ def _recreate_repository(
     policy: Policy,
     checkout: Path,
     allow_dirty_pr: bool = False,
+    tool_revision: str | None = None,
 ) -> RepositoryOutcome:
     """Rebuild an existing policy branch from the freshly synced default branch."""
 
@@ -856,6 +889,7 @@ def _recreate_repository(
         checkout=checkout,
         existing_pr=existing_pr,
         allow_dirty_pr=allow_dirty_pr,
+        tool_revision=tool_revision,
     )
 
 
@@ -870,6 +904,7 @@ def _recreate_existing_pull_request(
     existing_pr: object,
     changes: tuple[Change, ...] | None = None,
     allow_dirty_pr: bool = False,
+    tool_revision: str | None = None,
 ) -> RepositoryOutcome:
     """Rebuild one known policy PR from the freshly synchronized default branch."""
 
@@ -896,6 +931,7 @@ def _recreate_existing_pull_request(
             policy=policy,
             changes=body_changes,
             head_oid=existing_pr.expected_head_oid,
+            tool_revision=tool_revision,
         ):
             client.update_pull_request(
                 repository=full_name,
@@ -903,6 +939,7 @@ def _recreate_existing_pull_request(
                 policy=policy,
                 changes=body_changes,
                 head_oid=existing_pr.expected_head_oid,
+                tool_revision=tool_revision,
             )
         return RepositoryOutcome(
             repository,
@@ -927,6 +964,7 @@ def _recreate_existing_pull_request(
         policy=policy,
         changes=applied.changes,
         head_oid=head_oid,
+        tool_revision=tool_revision,
     )
     if pre_commit_failure is not None:
         _mark_dirty_pull_request(
diff --git a/repo_policy_sync/tests/test_github.py b/repo_policy_sync/tests/test_github.py
index 48d5d4a..c453919 100644
--- a/repo_policy_sync/tests/test_github.py
+++ b/repo_policy_sync/tests/test_github.py
@@ -458,6 +458,7 @@ def run(command: list[str]) -> str:
         policy=policy,
         changes=(),
         head_oid="a" * 40,
+        tool_revision="test-revision",
     )
 
     assert pull_request.url == "https://github.example/owner/repo/pull/1"
@@ -511,6 +512,7 @@ def run(command: list[str]) -> str:
         policy=policy,
         changes=(),
         head_oid="a" * 40,
+        tool_revision="test-revision",
     )
 
     assert not any(command[4] == "/repos/owner/repo/labels" for command in commands)
@@ -574,6 +576,7 @@ def run(command: list[str]) -> str:
             policy=policy,
             changes=(),
             head_oid="a" * 40,
+            tool_revision="test-revision",
         )
 
 
@@ -607,15 +610,13 @@ def run(command: list[str]) -> str:
         changes=(),
         head_oid="a" * 40,
         draft=True,
+        tool_revision="test-revision",
     )
 
     assert commands[1][:4] == ["gh", "pr", "create", "--draft"]
 
 
-def test_pull_request_template_explains_policy_trigger_and_changes(monkeypatch) -> None:
-    monkeypatch.setattr(
-        "repo_policy_sync.src.github._tool_revision", lambda: "abc1234-dirty"
-    )
+def test_pull_request_template_explains_policy_trigger_and_changes() -> None:
     policy = Policy(
         "score-docs-as-code.cleanup",
         "Update docs files",
@@ -625,7 +626,10 @@ def test_pull_request_template_explains_policy_trigger_and_changes(monkeypatch)
     )
 
     body = _pull_request_body(
-        policy, (Change(Path(".gitignore"), "add '_build'"),), head_oid="a" * 40
+        policy,
+        (Change(Path(".gitignore"), "add '_build'"),),
+        head_oid="a" * 40,
+        tool_revision="abc1234-dirty",
     )
 
     assert "<!-- repo-policy-sync-policy: score-docs-as-code.cleanup -->" in body
@@ -703,6 +707,7 @@ def test_module_policy_pull_request_includes_the_matching_rationale() -> None:
         policy,
         (Change(operation.path, "replace matching text", operation.rationale),),
         head_oid="a" * 40,
+        tool_revision="test-revision",
     )
 
     assert "- `MODULE.bazel`: replace matching text" in body
@@ -723,6 +728,7 @@ def test_value_policy_pull_request_explains_value_trigger() -> None:
         policy,
         (Change(Path("MODULE.bazel"), "add dependency"),),
         head_oid="a" * 40,
+        tool_revision="test-revision",
     )
 
     assert (
@@ -749,6 +755,7 @@ def record(command: list[str]) -> str:
         policy=policy,
         changes=(Change(Path(".gitignore"), "add '_build'"),),
         head_oid="a" * 40,
+        tool_revision="test-revision",
     )
 
     assert commands[0][:7] == [
@@ -767,7 +774,11 @@ def test_pull_request_template_includes_automation_failure() -> None:
     policy = Policy("example", "Example", None, None, ())
 
     body = _pull_request_body(
-        policy, (), head_oid="a" * 40, failure="bazel mod deps: command failed"
+        policy,
+        (),
+        head_oid="a" * 40,
+        failure="bazel mod deps: command failed",
+        tool_revision="test-revision",
     )
 
     assert "## Automation failure" in body
diff --git a/repo_policy_sync/tests/test_runner.py b/repo_policy_sync/tests/test_runner.py
index f0153db..ad2ecee 100644
--- a/repo_policy_sync/tests/test_runner.py
+++ b/repo_policy_sync/tests/test_runner.py
@@ -179,6 +179,7 @@ def create_pull_request(
         policy: Policy,
         changes: tuple,
         head_oid: str,
+        tool_revision: str,
         **_: object,
     ) -> PullRequest:
         self.create_calls += 1
@@ -187,7 +188,12 @@ def create_pull_request(
             url=f"https://github.example/{repository}/pull/1",
             expected_head_oid=head_oid,
             branch=branch,
-            body=_pull_request_body(policy, changes, head_oid=head_oid),
+            body=_pull_request_body(
+                policy,
+                changes,
+                head_oid=head_oid,
+                tool_revision=tool_revision,
+            ),
             mergeable="MERGEABLE",
         )
         return self.pull_request
@@ -641,6 +647,36 @@ def fake_sync_org(**_: object) -> SyncReport:
         )
 
 
+def test_apply_resolves_tool_revision_before_repository_synchronization(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    client = FakeRepositoryClient(tmp_path, (Repository("candidate", "main"),))
+    sync_called = False
+
+    def fail_tool_revision() -> str:
+        raise RepoPolicySyncError("tool revision unavailable")
+
+    def unexpected_sync(**_: object) -> SyncReport:
+        nonlocal sync_called
+        sync_called = True
+        raise AssertionError("repository synchronization must not start")
+
+    monkeypatch.setattr(runner, "_tool_revision", fail_tool_revision)
+    monkeypatch.setattr(runner, "sync_org", unexpected_sync)
+
+    with pytest.raises(RepoPolicySyncError, match="tool revision unavailable"):
+        run_policies(
+            client=client,
+            org="eclipse-score",
+            policies=(),
+            repository_names=(),
+            checkout_cache_directory=tmp_path / "cache",
+            apply=True,
+        )
+
+    assert not sync_called
+
+
 def test_runner_rejects_recreate_when_a_repository_pattern_selects_multiple(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch
 ) -> None:
@@ -1283,7 +1319,12 @@ def test_existing_compliant_pull_request_is_left_alone_with_current_body(
     change = runner.evaluate_policy(checkout, policy).changes
     client = ImplicitRecreateClient(
         mergeable="MERGEABLE",
-        body=_pull_request_body(policy, change, head_oid="a" * 40),
+        body=_pull_request_body(
+            policy,
+            change,
+            head_oid="a" * 40,
+            tool_revision="test-revision",
+        ),
     )
 
     outcome = _run_repository(
@@ -1294,6 +1335,7 @@ def test_existing_compliant_pull_request_is_left_alone_with_current_body(
         policy=policy,
         checkout=checkout,
         apply=True,
+        tool_revision="test-revision",
     )
 
     assert outcome.status == "pull-request-open"