refactor(cli-pr-monitor): poll/mod.rs + fix_commit.rs を 800 行以下に分割 (PR-W2)

[aloekun]

file_length enforcement Phase 1。mechanical refactor、behavior 不変、test count 不変。

• stages/poll/mod.rs (1404) → 6 module (mod 257 / iteration 365 / rate_limit 588 / rate_limit_signal 464 / review_recheck 428 / review_recheck_signal 313)
• fix_commit.rs (972) → fix_commit/ dir module (mod 16 / description 140 / abandon 428 / sweep 398)

全 file ≤ 800。tests は所属 module へ co-locate、helper は per-module 複製。
外部 API (crate::fix_commit::*, crate::stages::poll::{run_poll_loop, PollResult}) は再エクスポートで温存。

docs/file-length-enforcement-plan.md: fix_commit.rs 削除に伴う broken link を fix_commit/ へ repoint (docs-lint 追従)。

検証: cargo test -p cli-pr-monitor = 205 passed / 0 failed / 12 ignored (baseline 一致)、cargo clippy --workspace -- -D warnings = clean。

PR size は mechanical refactor のため PR_SIZE_CHECK_OVERRIDE で通過 (順位 151 の想定 use case)。

Summary by CodeRabbit

• New Features
  • PRモニタリングの1イテレーション処理を整理し、監視継続・停止・タイムアウト判定をより分かりやすくしました。
  • レート制限中／解除後の待機通知に、次回起床時刻などの情報を反映できるようになりました。
  • fix(review): 系の空コミットをPR範囲で自動的に整理する機能を追加しました。
• Bug Fixes
  • 条件に合わない空コミットや誤再配置のリスクを減らすため、判定のガードを強化しました。

[coderabbitai]

Warning

Review limit reached

@aloekun, we couldn't start this review because you've reached your PR review rate limit.

More reviews will be available in 36 minutes and 19 seconds. Learn how PR review limits work.

Your organization has used up its prepaid credits, and credit purchases are no longer available. Enable the review add-on in the billing tab to keep reviews running — you're only billed for reviews past your plan's rate limits ($0.25/file).

⌛ How to resolve this issue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based credits.

🚦 How do rate limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please see our Fair Usage Limits Policy for further information.

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 5e547f36-b2f3-402c-bf44-a29b8d50714e

📥 Commits

Reviewing files that changed from the base of the PR and between 3899437 and d9f9b1e.

📒 Files selected for processing (2)

• src/cli-pr-monitor/src/stages/poll/rate_limit_signal.rs
• src/cli-pr-monitor/src/stages/poll/review_recheck.rs

📝 Walkthrough

Walkthrough

fix_commit を submodule 化して description・abandon・sweep に分割し、poll では iteration と各 signal 生成を別モジュールへ抽出した。あわせて、PARK 文面、reparent、sweep、poll の state 更新とテストが整理された。

Changes

fix_commit モジュール分割

Layer / File(s)	Summary
description と状態表現 src/cli-pr-monitor/src/fix_commit/description.rs	FixCommitState、fix commit description 生成、issue の単行化、関連テストが追加された。
cleanup と reparent src/cli-pr-monitor/src/fix_commit/abandon.rs	空 fix commit の abandon、commit id 照合、PR tip への reparent、関連統合テストが追加された。
empty commit sweep src/cli-pr-monitor/src/fix_commit/sweep.rs	fix(review): を含む空 commit の列挙と abandon、統合テストが追加された。
mod.rs と docs 更新 src/cli-pr-monitor/src/fix_commit/mod.rs, docs/file-length-enforcement-plan.md	fix_commit のサブモジュール再エクスポートと docs の参照先更新が行われた。

poll ステージの分離

Layer / File(s)	Summary
review_recheck signal src/cli-pr-monitor/src/stages/poll/review_recheck_signal.rs, src/cli-pr-monitor/src/stages/poll/review_recheck.rs	safe minute 計算と review_recheck PARK signal の生成ロジックが新モジュールへ移された。
rate_limit signal src/cli-pr-monitor/src/stages/poll/rate_limit_signal.rs, src/cli-pr-monitor/src/stages/poll/rate_limit.rs	mergeable 判定、shortcut signal、posted retrigger PARK signal、rate-limit retry PARK signal が新モジュールへ追加され、rate_limit.rs のローカル実装とテストが整理された。
iteration 抽出と poll wiring src/cli-pr-monitor/src/stages/poll/iteration.rs, src/cli-pr-monitor/src/stages/poll/mod.rs	checker 実行と action 判定を iteration.rs に分離し、poll/mod.rs は委譲と型更新に整理された。
review_recheck tests src/cli-pr-monitor/src/stages/poll/review_recheck.rs	review_recheck の state 書き込み、fix_push_time の保持、recheck_count リセットに関するテストとヘルパーが追加された。

推定コードレビュー工数

🎯 4 (Complex) | ⏱️ ~60 minutes

関連する可能性のある PR

• aloekun/claude-code-hook-test#63: 同じ FixCommitState・create_fix_commit・try_abandon_empty_fix_commit の導入と fix commit ライフサイクルを扱っている。
• aloekun/claude-code-hook-test#170: MergeableStatus と [RATE_LIMIT_BUT_MERGEABLE] の shortcut 判定が同一の rate-limit コードパスにある。
• aloekun/claude-code-hook-test#214: review_recheck.rs の PARK signal 生成と poll の分割が同じ領域にある。

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	主要な変更である cli-pr-monitor の poll/mod.rs と fix_commit.rs の分割を正しく要約しており、簡潔で分かりやすいです。
Docstring Coverage	✅ Passed	Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[coderabbitai]

Actionable comments posted: 3

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)

src/cli-pr-monitor/src/stages/poll/mod.rs (1)

136-140: 🩺 Stability & Availability | 🟠 Major | ⚡ Quick win

process-global env var 用の lock は全 test module で共有してください。

PR_MONITOR_STATE_FILE_OVERRIDE は process-global ですが、この static LOCK は poll/mod.rs 内だけを直列化します。同じ PR の rate_limit.rs / review_recheck.rs 側にも別 static LOCK があるため、cargo test の並列実行で env override が相互に上書きされ得ます。共通の test helper に 1 つだけ置いて全モジュールから使ってください。

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@src/cli-pr-monitor/src/stages/poll/mod.rs` around lines 136 - 140, The env
override lock in env_override_lock is only serializing tests within poll/mod.rs,
but PR_MONITOR_STATE_FILE_OVERRIDE is process-global and must be shared across
all test modules. Move this lock into a single common test helper and update the
poll/mod.rs, rate_limit.rs, and review_recheck.rs test code to use that shared
lock instead of each defining its own static LOCK, so parallel cargo test runs
cannot overwrite the env var.

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@src/cli-pr-monitor/src/fix_commit/abandon.rs`:
- Around line 16-18: The create_fix_commit function in abandon.rs always runs jj
new even when findings is empty, which violates the FixCommitState::None
contract; add an early return at the start of create_fix_commit to map an empty
findings slice to None and skip commit creation. Use the existing
create_fix_commit, build_fix_commit_description, and FixCommitState::None
symbols to keep the normal monitor.rs call path from rewriting the repo for zero
findings and avoid empty header-only commits and unnecessary cleanup.

In `@src/cli-pr-monitor/src/stages/poll/rate_limit_signal.rs`:
- Around line 62-65: The shortcut clean check in `rate_limit_signal` is too
permissive when `CodeRabbitState` is incomplete, because `unresolved_threads:
None` is treated as clean and can wrongly emit `[RATE_LIMIT_BUT_MERGEABLE]`.
Update the `cr_clean` logic to be conservative in this path: when `coderabbit`
is present in `rate_limit_signal.rs`, require a fully known clean state and
incorporate `new_comments` and `actionable_comments` alongside
`unresolved_threads` when deciding whether the PR is safe to shortcut. Keep the
existing mergeability checks, but only allow the shortcut when `CodeRabbitState`
clearly indicates no outstanding review work.

In `@src/cli-pr-monitor/src/stages/poll/review_recheck.rs`:
- Line 40: The assignment in `review_recheck` is reversing the intended
write-once behavior for `fix_push_time`, since `ctx.fix_push_time` is currently
taking precedence over the existing state. Update the logic around
`state.fix_push_time` so the existing value in state is preserved and only
populated from `ctx.fix_push_time` when the state field is still unset, matching
the intended one-way initialization and keeping the preserve test passing.

---

Outside diff comments:
In `@src/cli-pr-monitor/src/stages/poll/mod.rs`:
- Around line 136-140: The env override lock in env_override_lock is only
serializing tests within poll/mod.rs, but PR_MONITOR_STATE_FILE_OVERRIDE is
process-global and must be shared across all test modules. Move this lock into a
single common test helper and update the poll/mod.rs, rate_limit.rs, and
review_recheck.rs test code to use that shared lock instead of each defining its
own static LOCK, so parallel cargo test runs cannot overwrite the env var.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 09bf229c-9891-48ea-ac8b-5f10b0d005ca

📥 Commits

Reviewing files that changed from the base of the PR and between 509c671 and 1d571d5.

📒 Files selected for processing (12)

• docs/file-length-enforcement-plan.md
• src/cli-pr-monitor/src/fix_commit.rs
• src/cli-pr-monitor/src/fix_commit/abandon.rs
• src/cli-pr-monitor/src/fix_commit/description.rs
• src/cli-pr-monitor/src/fix_commit/mod.rs
• src/cli-pr-monitor/src/fix_commit/sweep.rs
• src/cli-pr-monitor/src/stages/poll/iteration.rs
• src/cli-pr-monitor/src/stages/poll/mod.rs
• src/cli-pr-monitor/src/stages/poll/rate_limit.rs
• src/cli-pr-monitor/src/stages/poll/rate_limit_signal.rs
• src/cli-pr-monitor/src/stages/poll/review_recheck.rs
• src/cli-pr-monitor/src/stages/poll/review_recheck_signal.rs

💤 Files with no reviewable changes (1)

• src/cli-pr-monitor/src/fix_commit.rs

[aloekun]

@coderabbitai review

[coderabbitai]

✅ Action performed

Review finished.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

[coderabbitai]

♻️ Duplicate comments (1)

src/cli-pr-monitor/src/stages/poll/rate_limit_signal.rs (1)

62-66: 🎯 Functional Correctness | 🟠 Major | ⚡ Quick win

unresolved_threads: None を clean 扱いしないでください。

Line 66 の unwrap_or(0) だと、CR の未解決スレッド数が未取得でも shortcut が通ってしまいます。[RATE_LIMIT_BUT_MERGEABLE] を出す条件としてはまだ緩すぎるので、ここは Some(0) を必須にした方が安全です。あわせて unresolved_threads: None の回帰テストも 1 本あると再発防止になります。

修正例

     let cr_clean = coderabbit
         .map(|c| {
             c.new_comments == 0
                 && c.actionable_comments.unwrap_or(0) == 0
-                && c.unresolved_threads.unwrap_or(0) == 0
+                && c.unresolved_threads == Some(0)
         })
         .unwrap_or(true);

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@src/cli-pr-monitor/src/stages/poll/rate_limit_signal.rs` around lines 62 -
66, The clean-check in `rate_limit_signal.rs` is too permissive because
`cr_clean` treats `unresolved_threads: None` as zero via `unwrap_or(0)`, which
can incorrectly allow the `[RATE_LIMIT_BUT_MERGEABLE]` shortcut. Update the
logic in the `coderabbit.map(...)` block so `unresolved_threads` must be
explicitly `Some(0)` to count as clean, while keeping the existing
`new_comments` and `actionable_comments` checks unchanged. Also add a regression
test around the `rate_limit_signal` path to verify that `unresolved_threads:
None` does not produce a clean result.

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Duplicate comments:
In `@src/cli-pr-monitor/src/stages/poll/rate_limit_signal.rs`:
- Around line 62-66: The clean-check in `rate_limit_signal.rs` is too permissive
because `cr_clean` treats `unresolved_threads: None` as zero via `unwrap_or(0)`,
which can incorrectly allow the `[RATE_LIMIT_BUT_MERGEABLE]` shortcut. Update
the logic in the `coderabbit.map(...)` block so `unresolved_threads` must be
explicitly `Some(0)` to count as clean, while keeping the existing
`new_comments` and `actionable_comments` checks unchanged. Also add a regression
test around the `rate_limit_signal` path to verify that `unresolved_threads:
None` does not produce a clean result.

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 1ec23f73-8254-40de-a070-fadb6cb95b13

📥 Commits

Reviewing files that changed from the base of the PR and between 1d571d5 and 3899437.

📒 Files selected for processing (3)

• src/cli-pr-monitor/src/fix_commit/abandon.rs
• src/cli-pr-monitor/src/stages/poll/rate_limit_signal.rs
• src/cli-pr-monitor/src/stages/poll/review_recheck.rs

🚧 Files skipped from review as they are similar to previous changes (2)

• src/cli-pr-monitor/src/stages/poll/review_recheck.rs
• src/cli-pr-monitor/src/fix_commit/abandon.rs