Revert "fix: fall back to pr-scoped review cache restore"

This reverts commit 9feaeb9.

Author: gersmann

action.yml

@@ -91,14 +91,12 @@ runs:
         PYTHONPATH="${GITHUB_ACTION_PATH}:${PYTHONPATH:-}" \
           python3 -m cli.review.prepare_resume_state
     - name: Restore review Codex cache
-      if: ${{ inputs.mode == 'review' && steps.review_resume_state.outputs.restore_key_prefix != '' }}
+      if: ${{ inputs.mode == 'review' && steps.review_resume_state.outputs.restore_key != '' }}
       id: review_codex_cache
       uses: actions/cache/restore@v4
       with:
         path: ${{ steps.review_resume_state.outputs.codex_home }}
         key: ${{ steps.review_resume_state.outputs.restore_key }}
-        restore-keys: |
-          ${{ steps.review_resume_state.outputs.restore_key_prefix }}
     - name: Install Python dependencies
       shell: bash
       run: |
@@ -127,14 +125,13 @@ runs:
         CODEX_HOME: ${{ steps.review_resume_state.outputs.codex_home }}
         CODEX_REVIEW_PREVIOUS_HEAD_SHA: ${{ steps.review_resume_state.outputs.previous_reviewed_sha }}
         CODEX_REVIEW_CACHE_HIT: ${{ steps.review_codex_cache.outputs.cache-hit }}
-        CODEX_REVIEW_RESTORED_KEY: ${{ steps.review_codex_cache.outputs.cache-matched-key }}
       run: |
         set -euo pipefail
         # Execute the CLI directly; it detects GitHub Actions via env
         PYTHONPATH="${{ github.action_path }}:${PYTHONPATH:-}" \
           python3 -m cli.main
     - name: Save review Codex cache
-      if: ${{ inputs.mode == 'review' && steps.run_codex_cli.outcome == 'success' && steps.review_resume_state.outputs.current_cache_key != '' && steps.review_codex_cache.outputs.cache-matched-key != steps.review_resume_state.outputs.current_cache_key }}
+      if: ${{ inputs.mode == 'review' && steps.run_codex_cli.outcome == 'success' && steps.review_resume_state.outputs.current_cache_key != '' && !(steps.review_codex_cache.outputs.cache-hit == 'true' && steps.review_resume_state.outputs.restore_key == steps.review_resume_state.outputs.current_cache_key) }}
       uses: actions/cache/save@v4
       with:
         path: ${{ steps.review_resume_state.outputs.codex_home }}

cli/review/resume_state.py

@@ -87,7 +87,6 @@ def build_review_resume_outputs(
 ) -> dict[str, str]:
     codex_home = str(Path(runner_temp or ".").resolve() / "codex-review-state")
     restore_key = ""
-    restore_key_prefix = ""
     current_cache_key = ""
 
     if pr_number and repository and model_name and current_head_sha:
@@ -104,17 +103,11 @@ def build_review_resume_outputs(
             model_name,
             previous_reviewed_sha,
         )
-    if pr_number and repository:
-        restore_key_prefix = (
-            f"codex-review-{REVIEW_RESUME_CACHE_VERSION}-"
-            f"{_sanitize_cache_component(repository)}-pr-{pr_number}-"
-        )
 
     return {
         "codex_home": codex_home,
         "previous_reviewed_sha": previous_reviewed_sha or "",
         "restore_key": restore_key,
-        "restore_key_prefix": restore_key_prefix,
         "current_cache_key": current_cache_key,
     }
 

cli/workflows/review_workflow.py

@@ -204,9 +204,6 @@ def _latest_reviewed_head_sha(
         return None
 
     def _resume_cache_was_restored(self) -> bool:
-        restored_key = os.environ.get("CODEX_REVIEW_RESTORED_KEY")
-        if isinstance(restored_key, str) and restored_key.strip():
-            return True
         cache_hit = os.environ.get("CODEX_REVIEW_CACHE_HIT")
         if cache_hit is None:
             return True

tests/test_module_coverage.py

@@ -746,12 +746,10 @@ def test_review_action_and_workflow_use_expected_resume_guard_and_model() -> Non
     workflow_yaml = Path(".github/workflows/codex-review.yml").read_text(encoding="utf-8")
 
     assert (
-        "steps.review_codex_cache.outputs.cache-matched-key != "
+        "steps.review_codex_cache.outputs.cache-hit == 'true' && "
+        "steps.review_resume_state.outputs.restore_key == "
         "steps.review_resume_state.outputs.current_cache_key"
     ) in action_yaml
-    assert "restore-keys: |" in action_yaml
-    assert "steps.review_resume_state.outputs.restore_key_prefix" in action_yaml
-    assert "CODEX_REVIEW_RESTORED_KEY" in action_yaml
     assert "model: gpt-5.4" in workflow_yaml
     assert "model: gpt-5.1-codex-max" not in workflow_yaml
 

tests/test_resume_state.py

@@ -54,7 +54,6 @@ def test_build_review_resume_outputs_uses_previous_sha_for_restore_key(tmp_path:
         "codex_home": str((tmp_path / "codex-review-state").resolve()),
         "previous_reviewed_sha": "oldsha",
         "restore_key": "codex-review-v1-owner-repo-pr-17-gpt-5.4-oldsha",
-        "restore_key_prefix": "codex-review-v1-owner-repo-pr-17-",
         "current_cache_key": "codex-review-v1-owner-repo-pr-17-gpt-5.4-newsha",
     }