claude-dev-env 2.1.0 → 2.2.0

package/skills/pr-converge/reference/per-tick.md

@@ -15,29 +15,38 @@ Use on **draft PR**. Cursor Bugbot and `/bugteam` re-run after each push. Fix
 findings between rounds until back-to-back clean on same `HEAD`, then mark
 PR ready for review.
 
-Run every tick in parent harness session. Pacing lives in
-[`../workflows/schedule-wakeup-loop.md`](../workflows/schedule-wakeup-loop.md) (read before Step 4); see [Pacing
-workflow](#pacing-workflow).
+Run every tick in the parent harness session. Pacing depends on the selected
+pacer from pre-flight (`select_converge_pacer.py`):
+
+- `schedule_wakeup` — [`../workflows/schedule-wakeup-loop.md`](../workflows/schedule-wakeup-loop.md)
+- `portable` — [`../../_shared/pr-loop/portable-driver.md`](../../_shared/pr-loop/portable-driver.md)
+
+See [Pacing workflow](#pacing-workflow).
 
 Every BUGTEAM tick runs **bugteam** — never hand-rolled substitute. Fix
-protocol per [fix-protocol.md](fix-protocol.md). Pacing stays in main session via
-`ScheduleWakeup` (pre-flight aborts when absent).
+protocol per [fix-protocol.md](fix-protocol.md). Pacing stays in the main
+session (native `ScheduleWakeup` or the portable continuous driver).
 
 ## Invocation modes
 
-- **`/pr-converge`** runs one tick, then Step 4 schedules the next via
-  `ScheduleWakeup`. Omit the next wakeup only on convergence or **Stop
-  conditions**.
+- **`/pr-converge` with `pacer=schedule_wakeup`** runs one tick, then Step 4
+  schedules the next via `ScheduleWakeup`. Omit the next wakeup only on
+  convergence or **Stop conditions**.
+- **`/pr-converge` with `pacer=portable`** runs ticks continuously in-session
+  (poll waits at the same delays); write handoff at budget boundaries. See
+  the portable driver.
 
 ## Pacing workflow
 
-Read [`../workflows/schedule-wakeup-loop.md`](../workflows/schedule-wakeup-loop.md)
+When `pacer=schedule_wakeup`, read
+[`../workflows/schedule-wakeup-loop.md`](../workflows/schedule-wakeup-loop.md)
 (installed copy under `$HOME/.claude/skills/pr-converge/workflows/`) before
-Step 4. The pre-flight gate guarantees `ScheduleWakeup` is invokable; the
-workflow file specifies delays, prompts, and convergence cleanup.
+Step 4. When `pacer=portable`, read
+[`../../_shared/pr-loop/portable-driver.md`](../../_shared/pr-loop/portable-driver.md)
+and skip `ScheduleWakeup` calls.
 
 - **`/pr-converge`** (default): loops until convergence. After each tick
-  (unless converged or stopped), run **Step 4**.
+  (unless converged or stopped), run **Step 4** using the selected pacer.
 
 ## Step 1: Resolve current HEAD and PR context
 
@@ -244,8 +253,8 @@ c. Decide (three branches; match first whose predicate holds):
 
    - **Failed review (`returncode != 0`, or chain mode with null
      `served_command`):** The review did not complete a successful serve. Do
-     not set `code_review_clean_at`. Stay `phase = CODE_REVIEW`, schedule next
-     wakeup, return. A failed chain often leaves `dirty_tree` false — that is
+     not set `code_review_clean_at`. Stay `phase = CODE_REVIEW`, apply Step 4 pacer
+     (ScheduleWakeup or portable continue/poll), return. A failed chain often leaves `dirty_tree` false — that is
      not a clean stamp.
    - **Fixes applied (working tree dirty / `dirty_tree` true):** Commit the
      applied fixes in one commit → push, following the shared fix protocol
@@ -253,7 +262,7 @@ c. Decide (three branches; match first whose predicate holds):
      push-invalidated markers per [ground-rules.md](ground-rules.md) /
      [state-schema.md](state-schema.md) (all `*_clean_at`, `merge_state_status`,
      `bugbot_down`, `bugbot_acknowledged_at`, `codex_down`). Stay
-     `phase = CODE_REVIEW`, schedule next wakeup, return. Every fix push
+     `phase = CODE_REVIEW`, apply Step 4 pacer (ScheduleWakeup or portable continue/poll), return. Every fix push
      re-enters the internal passes on the new HEAD.
    - **Clean (successful serve: `returncode == 0`, chain `served_command`
      non-null when `mode == chain`, and `dirty_tree` false):** Set
@@ -318,7 +327,7 @@ d. Decide based on post-bugteam state — order matters. Check
 pushed-during-bugteam FIRST so a convergence report against a stale HEAD
 never falsely terminates:
    - **Audit pushed this tick (clean-at fields reset in step b):**
-     `phase = CODE_REVIEW`, schedule next wakeup, return. Every fix push
+     `phase = CODE_REVIEW`, apply Step 4 pacer (ScheduleWakeup or portable continue/poll), return. Every fix push
      re-enters the internal passes on the new HEAD.
    - **Convergence AND no push:** the internal passes are clean on
      `current_head`. Stamp `bugteam_clean_at = current_head`, then
@@ -328,8 +337,8 @@ never falsely terminates:
      ([`../../../_shared/pr-loop/fix-protocol.md`](../../../_shared/pr-loop/fix-protocol.md); skill deltas in [fix-protocol.md](fix-protocol.md)). Reset push-invalidated markers
      per [ground-rules.md](ground-rules.md) / [state-schema.md](state-schema.md)
      (all `*_clean_at`, `merge_state_status`, `bugbot_down`,
-     `bugbot_acknowledged_at`, `codex_down`), `phase = CODE_REVIEW`, schedule
-     next wakeup, return.
+     `bugbot_acknowledged_at`, `codex_down`), `phase = CODE_REVIEW`, apply Step 4 pacer
+     (ScheduleWakeup or portable continue/poll), return.
 
 ### `phase == BUGBOT` (terminal gate)
 
@@ -386,7 +395,7 @@ pull_request_read(owner=OWNER, repo=REPO, pullNumber=NUMBER, method="get_review_
 c. Decide (four branches; match first whose predicate holds):
    - **No bugbot review yet, OR latest review's `commit_id` ≠
      `current_head`:** Re-trigger bugbot (Step 3), set `bugbot_clean_at =
-     null`, reset `inline_lag_streak = 0`, schedule next wakeup, return to the
+     null`, reset `inline_lag_streak = 0`, apply Step 4 pacer (ScheduleWakeup or portable continue/poll), return to the
      Bugbot gate next tick.
    - **`commit_id == current_head` AND zero unaddressed inline AND review
      body clean:** Set `bugbot_clean_at = current_head`, reset
@@ -402,7 +411,7 @@ c. Decide (four branches; match first whose predicate holds):
      `state.json`: the clean-coder teammate executes the fix, writes
      `state.json`, goes idle; the next tick re-enters CODE_REVIEW on the new
      HEAD. No `state.json` (single-PR): the lead executes it, stays
-     `phase = CODE_REVIEW`. Schedule next wakeup, return.
+     `phase = CODE_REVIEW`. Apply Step 4 pacer (ScheduleWakeup or portable continue/poll), return.
 
 ### `phase == COPILOT_WAIT`
 
@@ -435,12 +444,12 @@ b. Decide (three branches; match first whose predicate holds):
      (all `*_clean_at`, `merge_state_status`, `bugbot_down`,
      `bugbot_acknowledged_at`, `codex_down`). **Set `phase = CODE_REVIEW`**
      (NOT COPILOT_WAIT) — every fix push re-enters the internal passes on the
-     new HEAD. Schedule next wakeup, return.
+     new HEAD. Apply Step 4 pacer (ScheduleWakeup or portable continue/poll), return.
    - **No Copilot review at `current_head` yet:** Increment
      `copilot_wait_count` (init 0 on COPILOT_WAIT entry; reset to 0 on
      every push and on every successful Copilot review). `>= 3` → hard
      blocker per [stop-conditions.md](stop-conditions.md). Otherwise
-     schedule next wakeup (360s), return.
+     apply Step 4 pacer (ScheduleWakeup or portable continue/poll; 360s wait), return.
 
 **Non-negotiable:** After any Copilot fix push, `phase` MUST route to
 `CODE_REVIEW`. Never cycle COPILOT_WAIT → fix → COPILOT_WAIT. The
@@ -508,8 +517,11 @@ base), never an invented commit range.
 
 ## Step 4: Loop pacing
 
-**`ScheduleWakeup` field hints** (prefer [Pacing
-workflow](#pacing-workflow)):
+Apply the pacer selected at pre-flight ([Pacing workflow](#pacing-workflow)).
+
+### `pacer=schedule_wakeup`
+
+**`ScheduleWakeup` field hints:**
 
 - `delaySeconds: 360` after bugbot re-trigger. Exception:
   BUGBOT inline-lag branch uses `delaySeconds: 90` (no re-trigger;
@@ -521,6 +533,21 @@ workflow](#pacing-workflow)):
 **On convergence:** apply **Convergence** section of
 `../workflows/schedule-wakeup-loop.md` (omit wakeups).
 
+### `pacer=portable`
+
+Do **not** call `ScheduleWakeup`. After writing state and handoff:
+
+- **Immediate work next** → continue the next tick in the same turn.
+- **Wait next** (Bugbot queued, COPILOT_WAIT with no review yet) → poll
+  in-session for the same delay (`360` default, `90` on Bugbot inline-lag),
+  then resume the same step. Honor the same hard caps as the ScheduleWakeup
+  path.
+- **Budget too low for a full tick** → stop at the tick boundary; print
+  `/pr-converge <PR URL>` and the persisted phase.
+
+Full portable rules:
+[`../../_shared/pr-loop/portable-driver.md`](../../_shared/pr-loop/portable-driver.md).
+
 ## Bugteam execution
 
 **Second audit** (BUGTEAM phase) is **always** **bugteam** skill: preflight,

package/skills/pr-converge/test_portable_pacer_gate.py

@@ -0,0 +1,67 @@
+"""Contract checks: pr-converge selects a portable pacer when ScheduleWakeup is absent."""
+
+from __future__ import annotations
+
+import re
+from pathlib import Path
+
+SKILL_ROOT = Path(__file__).resolve().parent
+SKILL_MARKDOWN_PATH = SKILL_ROOT / "SKILL.md"
+PER_TICK_MARKDOWN_PATH = SKILL_ROOT / "reference" / "per-tick.md"
+PORTABLE_DRIVER_PATH = (
+    SKILL_ROOT.parent / "_shared" / "pr-loop" / "portable-driver.md"
+)
+
+SELECT_CONVERGE_PACER_SCRIPT = "select_converge_pacer.py"
+PACER_PORTABLE_TOKEN = "pacer=portable"
+PACER_SCHEDULE_WAKEUP_TOKEN = "pacer=schedule_wakeup"
+ABORT_ONLY_PHRASE = "pr-converge requires ScheduleWakeup; aborting"
+PORTABLE_DRIVER_DOC = "portable-driver.md"
+PORTABLE_DRIVER_LINK_PATTERN = re.compile(
+    r"\((?P<relative>(?:\.\./)+_shared/pr-loop/portable-driver\.md)\)"
+)
+
+
+def test_skill_selects_pacer_and_forbids_abort_only_schedule_wakeup() -> None:
+    skill_text = SKILL_MARKDOWN_PATH.read_text(encoding="utf-8")
+    assert SELECT_CONVERGE_PACER_SCRIPT in skill_text
+    assert PACER_PORTABLE_TOKEN in skill_text
+    assert PACER_SCHEDULE_WAKEUP_TOKEN in skill_text
+    assert PORTABLE_DRIVER_DOC in skill_text
+    assert ABORT_ONLY_PHRASE not in skill_text
+
+
+def test_skill_portable_driver_links_resolve_on_disk() -> None:
+    skill_text = SKILL_MARKDOWN_PATH.read_text(encoding="utf-8")
+    all_relative_links = PORTABLE_DRIVER_LINK_PATTERN.findall(skill_text)
+    assert all_relative_links, "SKILL.md must link portable-driver.md"
+    for each_relative_link in all_relative_links:
+        resolved_path = (SKILL_MARKDOWN_PATH.parent / each_relative_link).resolve()
+        assert resolved_path.is_file(), (
+            f"portable-driver link must resolve on disk: "
+            f"{each_relative_link} -> {resolved_path}"
+        )
+        assert resolved_path == PORTABLE_DRIVER_PATH.resolve()
+
+
+def test_per_tick_documents_both_pacers() -> None:
+    per_tick_text = PER_TICK_MARKDOWN_PATH.read_text(encoding="utf-8")
+    assert "portable" in per_tick_text
+    assert "schedule_wakeup" in per_tick_text or "ScheduleWakeup" in per_tick_text
+    assert PORTABLE_DRIVER_DOC in per_tick_text
+    assert "pacer=portable" in per_tick_text
+    assert "Do **not** call `ScheduleWakeup`" in per_tick_text or (
+        "Do not call `ScheduleWakeup`" in per_tick_text
+    )
+
+
+def test_portable_driver_protocol_exists() -> None:
+    assert PORTABLE_DRIVER_PATH.is_file()
+    portable_text = PORTABLE_DRIVER_PATH.read_text(encoding="utf-8")
+    assert "check_convergence.py" in portable_text
+    assert "invoke_code_review.py" in portable_text
+    assert "resolve_worker_spawn.py" in portable_text
+    assert "build_converge_task_list.py" in portable_text
+    assert "all_runnable_reviews_clean_same_head" in portable_text
+    assert "portable_converge_driver.py" in portable_text
+    assert "Never abort solely because" in portable_text

package/skills/pr-converge/workflows/schedule-wakeup-loop.md

@@ -1,8 +1,10 @@
 # ScheduleWakeup loop pacing (pr-converge)
 
-Load this document for converge **loop pacing**. The pre-flight in `SKILL.md`
-guarantees `ScheduleWakeup` is available before any tick runs. Shared bugbot
-/ bugteam / Fix protocol steps stay in the main `SKILL.md`.
+Load this document when pre-flight selects `pacer=schedule_wakeup`. When
+`pacer=portable`, use
+[`../../_shared/pr-loop/portable-driver.md`](../../_shared/pr-loop/portable-driver.md)
+instead. Shared bugbot / bugteam / Fix protocol steps stay in the main
+`SKILL.md`.
 
 ## Calling ScheduleWakeup