claude-dev-env 1.47.0 → 1.49.0

package/skills/pr-converge/reference/ground-rules.md

@@ -6,10 +6,12 @@
 - **All `*_clean_at`, `merge_state_status`, and `bugbot_down` reset on every push.**
 - **`bugbot run` comment is load-bearing.** Literal phrase exactly —
   empirically the only re-trigger Cursor Bugbot recognizes.
-- **All production edits go through `clean-coder`.** The lead never edits
-  production files directly. Every fix — bugbot, bugteam, Copilot, or
-  Claude finding — spawns `Agent(subagent_type="clean-coder")` to
-  implement. No exceptions.
+- **Production edits go through `clean-coder`, except `/code-review --fix`.**
+  The lead never hand-edits production files. Every bugbot, bugteam,
+  Copilot, or Claude finding spawns `Agent(subagent_type="clean-coder")` to
+  implement the fix. The CODE_REVIEW phase is the one exception: `/code-review
+  --fix` applies its own findings to the working tree, which the next
+  BUGBOT/BUGTEAM cycle re-reviews after the loop resets.
 - **Adapt when reality contradicts on-disk state.** If `state.json`,
   `git`, or `gh` disagree with live PR, escalate as hard blocker per
   [stop-conditions.md](stop-conditions.md).

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

@@ -53,7 +53,7 @@ Capture `number`, `head.sha` (= `current_head`), owner/repo, branch.
 `python "$HOME/.claude/_shared/pr-loop/scripts/reviews_disabled.py" --reviewer bugbot`
 
 - Exit 0 (`CLAUDE_REVIEWS_DISABLED` lists `bugbot`) → set `bugbot_down = true`,
-  `phase = BUGTEAM`, continue BUGTEAM in the same tick; skip steps a–c below.
+  `phase = CODE_REVIEW`, continue CODE_REVIEW in the same tick; skip steps a–c below.
 - Exit 1 → proceed to step a.
 
 Because `bugbot_down` resets on every push, this gate re-runs on every
@@ -99,9 +99,9 @@ c. Decide (four branches; match first whose predicate holds):
      null`, reset `inline_lag_streak = 0`, schedule next wakeup, return.
    - **`commit_id == current_head` AND zero unaddressed inline AND review
      body clean:** Set `bugbot_clean_at = current_head`, reset
-     `inline_lag_streak = 0`, `phase = BUGTEAM`. Continue BUGTEAM in same
-     tick — back-to-back convergence requires bugteam on same HEAD
-     before next wakeup.
+     `inline_lag_streak = 0`, `phase = CODE_REVIEW`. Continue CODE_REVIEW
+     in same tick — back-to-back convergence requires code-review then
+     bugteam on same HEAD before next wakeup.
    - **`commit_id == current_head` with unaddressed inline findings:**
      Apply **Fix protocol**. Reset `inline_lag_streak = 0`. With
      `state.json`: clean-coder teammate pushes, replies inline, writes
@@ -113,6 +113,33 @@ c. Decide (four branches; match first whose predicate holds):
      full contract).
      Schedule next wakeup, return.
 
+### `phase == CODE_REVIEW`
+
+Local correctness/quality pass between BUGBOT clean and BUGTEAM. Enters
+after BUGBOT reports clean on `current_head` (or `bugbot_down == true`).
+Runs Claude Code's built-in `/code-review --fix` on the current diff; it
+produces no GitHub review artifact, so there are no code-review threads to
+resolve.
+
+a. Run Claude Code's built-in `/code-review --fix` on the current diff —
+   the [local diff review](https://code.claude.com/docs/en/code-review#review-a-diff-locally).
+   It reviews the diff and applies its findings to the working tree. Pass
+   no effort argument, so the review uses the session's current effort.
+
+b. Decide (two branches; match first whose predicate holds):
+
+   - **`/code-review` applied fixes (working tree changed):** Commit the
+     applied fixes in one commit → push, following [Single-PR fix
+     workflow](fix-protocol.md#single-pr-fix-workflow). Reset
+     `bugbot_clean_at = null` AND `code_review_clean_at = null`. Re-trigger
+     bugbot (Step 3) so the new HEAD enters the queue. Set `phase = BUGBOT`,
+     schedule next wakeup, return. A code-review fix push requires a full
+     back-to-back-clean cycle on the new HEAD.
+   - **Clean (no changes applied):** Set
+     `code_review_clean_at = current_head`, `phase = BUGTEAM`. Continue
+     BUGTEAM in same tick — back-to-back convergence requires bugbot,
+     code-review, and bugteam all clean on the same HEAD.
+
 ### `phase == BUGTEAM`
 
 a. Run **bugteam** on current PR.
@@ -222,14 +249,14 @@ BUGBOT.
   `bugbot_down = true` and routes to BUGTEAM before any trigger flow runs,
   so the checks below are skipped.
 - [ ] **Silent-pass pre-check.** Run `python ~/.claude/skills/pr-converge/scripts/check_bugbot_ci.py --check-clean --owner <O> --repo <R> --sha <current_head>`
-- [ ] Exit 0 → bugbot CI completed clean with no review (silent pass); set `bugbot_clean_at = current_head`, `phase = BUGTEAM`, continue BUGTEAM same tick
+- [ ] Exit 0 → bugbot CI completed clean with no review (silent pass); set `bugbot_clean_at = current_head`, `phase = CODE_REVIEW`, continue CODE_REVIEW same tick
 - [ ] Exit 1 (not a silent pass) or Exit 2 (gh CLI error — silent pass not confirmable) → continue with the trigger flow below
 - [ ] Run `python ~/.claude/skills/pr-converge/scripts/check_bugbot_ci.py --check-active --owner <O> --repo <R> --sha <current_head>`
 - [ ] Exit 0 → bugbot already queued on this commit; skip posting, wait for completion
 - [ ] Exit 1 → post trigger via `add_issue_comment(owner="OWNER", repo="REPO", issueNumber=NUMBER, body="bugbot run")`
 - [ ] Wait 8s
 - [ ] Run `python ~/.claude/skills/pr-converge/scripts/check_bugbot_ci.py --owner <O> --repo <R> --sha <current_head>`
-- [ ] Exit non-zero → bugbot is down; set `bugbot_down = true`, `phase = BUGTEAM`, continue BUGTEAM same tick
+- [ ] Exit non-zero → bugbot is down; set `bugbot_down = true`, `phase = CODE_REVIEW`, continue CODE_REVIEW same tick
 - [ ] Exit 0 (check run present) → record `bugbot_acknowledged_at = <now ISO 8601>`, proceed to Step 4
 
 The silent-pass pre-check fires FIRST so we never re-trigger a bot that

package/skills/pr-converge/reference/state-schema.md

@@ -9,9 +9,13 @@ across PRs. Both files share most of the fields below; the
 live ONLY in the single-PR `$CLAUDE_JOB_DIR/pr-converge-state.json` file
 (see those field entries below for details).
 
-- `phase`: `BUGBOT`, `BUGTEAM`, or `COPILOT_WAIT`. Start `BUGBOT` on first tick.
+- `phase`: `BUGBOT`, `CODE_REVIEW`, `BUGTEAM`, or `COPILOT_WAIT`. Start
+  `BUGBOT` on first tick.
 - `bugbot_clean_at`: HEAD SHA where bugbot last reported clean, or `null`.
   Reset to `null` on every push.
+- `code_review_clean_at`: HEAD SHA where the `/code-review` pass last
+  reported clean (no validated findings), or `null`. Reset to `null` on
+  every push.
 - `copilot_clean_at`: HEAD SHA where Copilot last reported clean, or `null`.
   Reset to `null` on every push.
 - `copilot_wait_count`: integer, init `0`. Consecutive COPILOT_WAIT ticks

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

@@ -6,8 +6,9 @@ guarantees `ScheduleWakeup` is available before any tick runs. Shared bugbot
 
 ## Calling ScheduleWakeup
 
-At end of every tick — across all phases (BUGBOT, BUGTEAM, COPILOT_WAIT)
-without distinction — call `ScheduleWakeup` unless convergence or another
+At end of every tick — across all phases (BUGBOT, CODE_REVIEW, BUGTEAM,
+COPILOT_WAIT) without distinction — call `ScheduleWakeup` unless convergence
+or another
 stop condition already omitted pacing:
 
 - `delaySeconds: 360` — default wakeup interval. Keeps the loop advancing

package/skills/session-log/SKILL.md

@@ -65,6 +65,7 @@ Resolve the metadata used by the frontmatter and the vault path:
 
 - **Project name:** infer from conversation context
 - **Session number:** from backend detection above
+- **Session ID:** the session ID of the agent authoring this log, read from the `CLAUDE_CODE_SESSION_ID` environment variable (PowerShell: `$env:CLAUDE_CODE_SESSION_ID`). This UUID names the authoring agent's own transcript file (`<session-id>.jsonl`), so the saved report points back to the exact session that produced it. When the variable is unset, use the literal `unknown`.
 - **Date:** today's date
 - **Title:** a 2–5 word summary of the session's primary outcome. Examples: "Amazon Auth Migration", "Source Loading Fix", "PR 475 Convergence". Avoid generic titles like "Bug Fixes".
 
@@ -75,6 +76,7 @@ The frontmatter contract every session report carries (inside an HTML comment, a
 type: session-report
 project: [name]
 session: [N]
+session_id: [uuid]
 date: [YYYY-MM-DD]
 status: completed|in-progress|blocked
 blocked: true|false
@@ -83,7 +85,7 @@ tags: [session, [project-tag], [topic-tags]]
 -->
 ```
 
-Every session report carries this metadata block verbatim so vault search and the tidy step in step 5 work. **Initial values for Step 2's Write:** substitute concrete values for every placeholder — for `vault_context_retrieved`, write the literal value `false` (the safe default before Step 3's vault-MCP-tool scan completes). Step 3 then Edits this to `true` if any of the three vault MCP tools fired this session.
+Every session report carries this metadata block verbatim so vault search and the tidy step in step 5 work. **Initial values for Step 2's Write:** substitute concrete values for every placeholder — for `session_id`, write the value read from `CLAUDE_CODE_SESSION_ID` in step 1 (or `unknown` when the variable is unset); for `vault_context_retrieved`, write the literal value `false` (the safe default before Step 3's vault-MCP-tool scan completes). Step 3 then Edits `vault_context_retrieved` to `true` if any of the three vault MCP tools fired this session.
 
 ## Step 2: Compose the HTML via doc-gist's shape principles
 
@@ -191,6 +193,7 @@ The primary outcome comes from the session title resolved in step 1.
 - [ ] HTML composed via doc-gist's shape principles (gallery-anchored)
 - [ ] `<!-- @publish-as-gist -->` marker present somewhere in the HTML
 - [ ] Frontmatter HTML comment present at top of `<body>`
+- [ ] `session_id` frontmatter field set from `CLAUDE_CODE_SESSION_ID` (the authoring agent's own session), or `unknown` when the variable is unset
 - [ ] Opening section answers "what shipped / why / impact" for a cold reader
 - [ ] Self-contained HTML (no relative-path asset refs; avoid external dependencies)
 - [ ] Auto-publish URLs captured from step 2 and step 3 (or HTML emitted to chat when step 2 Write failed)