claude-dev-env 1.36.1 → 1.37.0

package/skills/pr-converge/scripts/test_open_followup_copilot_pr.py

@@ -1,236 +0,0 @@
-"""Tests for open_followup_copilot_pr.
-
-Covers:
-- branch name follows COPILOT_FOLLOWUP_BRANCH_TEMPLATE with the short SHA
-- subprocess sequence: gh pr view (base ref) -> git fetch -> git switch -c -> git push -> gh pr create
-- gh pr create uses --draft, --base, --head, --title, --body-file (per gh-body-file rule)
-- the returned PR URL is the trimmed stdout from gh pr create
-- subprocess errors propagate
-"""
-
-from __future__ import annotations
-
-import importlib.util
-import json
-import subprocess
-from pathlib import Path
-from types import ModuleType
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-
-def _load_module() -> ModuleType:
-    module_path = Path(__file__).parent / "open_followup_copilot_pr.py"
-    spec = importlib.util.spec_from_file_location(
-        "open_followup_copilot_pr", module_path
-    )
-    assert spec is not None
-    assert spec.loader is not None
-    module = importlib.util.module_from_spec(spec)
-    spec.loader.exec_module(module)
-    return module
-
-
-open_followup_copilot_pr_module = _load_module()
-
-
-def _completed(stdout: str) -> subprocess.CompletedProcess:
-    process = MagicMock(spec=subprocess.CompletedProcess)
-    process.stdout = stdout
-    process.returncode = 0
-    return process
-
-
-def _scripted_subprocess_runs(
-    *,
-    base_ref_payload: str,
-    new_pr_url: str,
-) -> list[subprocess.CompletedProcess]:
-    return [
-        _completed(base_ref_payload),
-        _completed(""),
-        _completed(""),
-        _completed(""),
-        _completed(new_pr_url),
-    ]
-
-
-def test_should_build_branch_name_from_parent_number_and_short_sha(
-    tmp_path: Path,
-) -> None:
-    findings_file = tmp_path / "findings.md"
-    findings_file.write_text("- Item 1\n", encoding="utf-8")
-    payload_sequence = _scripted_subprocess_runs(
-        base_ref_payload=json.dumps({"baseRefName": "main"}),
-        new_pr_url="https://github.com/acme/widget/pull/313\n",
-    )
-    with patch("subprocess.run", side_effect=payload_sequence) as mock_run:
-        open_followup_copilot_pr_module.open_followup_copilot_pr(
-            owner="acme",
-            repo="widget",
-            parent_number=312,
-            head="abc12345deadbeefcafe",
-            findings_file=findings_file,
-        )
-    git_switch_argv = mock_run.call_args_list[2][0][0]
-    expected_branch = "chore/copilot-followup-312-abc12345"
-    assert expected_branch in git_switch_argv
-
-
-def test_should_invoke_subprocess_call_sequence_in_documented_order(
-    tmp_path: Path,
-) -> None:
-    findings_file = tmp_path / "findings.md"
-    findings_file.write_text("- Item\n", encoding="utf-8")
-    payload_sequence = _scripted_subprocess_runs(
-        base_ref_payload=json.dumps({"baseRefName": "main"}),
-        new_pr_url="https://github.com/acme/widget/pull/313\n",
-    )
-    with patch("subprocess.run", side_effect=payload_sequence) as mock_run:
-        open_followup_copilot_pr_module.open_followup_copilot_pr(
-            owner="acme",
-            repo="widget",
-            parent_number=312,
-            head="abc12345deadbeefcafe",
-            findings_file=findings_file,
-        )
-    invoked_command_sequence = [
-        each_call[0][0] for each_call in mock_run.call_args_list
-    ]
-    assert invoked_command_sequence[0][0:3] == ["gh", "pr", "view"]
-    assert invoked_command_sequence[1][0:2] == ["git", "fetch"]
-    assert invoked_command_sequence[2][0:3] == ["git", "switch", "-c"]
-    assert invoked_command_sequence[3][0:2] == ["git", "push"]
-    assert invoked_command_sequence[4][0:3] == ["gh", "pr", "create"]
-
-
-def test_should_invoke_gh_pr_create_with_draft_and_body_file_flags(
-    tmp_path: Path,
-) -> None:
-    findings_file = tmp_path / "findings.md"
-    findings_file.write_text("- Finding A\n", encoding="utf-8")
-    payload_sequence = _scripted_subprocess_runs(
-        base_ref_payload=json.dumps({"baseRefName": "develop"}),
-        new_pr_url="https://github.com/acme/widget/pull/444\n",
-    )
-    with patch("subprocess.run", side_effect=payload_sequence) as mock_run:
-        open_followup_copilot_pr_module.open_followup_copilot_pr(
-            owner="acme",
-            repo="widget",
-            parent_number=312,
-            head="abc12345deadbeef",
-            findings_file=findings_file,
-        )
-    pr_create_argv = mock_run.call_args_list[4][0][0]
-    assert pr_create_argv[0:3] == ["gh", "pr", "create"]
-    assert "--draft" in pr_create_argv
-    assert "--base" in pr_create_argv
-    assert "develop" in pr_create_argv
-    assert "--head" in pr_create_argv
-    assert "--title" in pr_create_argv
-    assert "--body-file" in pr_create_argv
-    body_file_argv = pr_create_argv[pr_create_argv.index("--body-file") + 1]
-    assert body_file_argv == str(findings_file)
-
-
-def test_should_render_pr_title_via_named_template_constant(tmp_path: Path) -> None:
-    findings_file = tmp_path / "findings.md"
-    findings_file.write_text("- Finding\n", encoding="utf-8")
-    payload_sequence = _scripted_subprocess_runs(
-        base_ref_payload=json.dumps({"baseRefName": "main"}),
-        new_pr_url="https://github.com/acme/widget/pull/513\n",
-    )
-    with patch("subprocess.run", side_effect=payload_sequence) as mock_run:
-        open_followup_copilot_pr_module.open_followup_copilot_pr(
-            owner="acme",
-            repo="widget",
-            parent_number=312,
-            head="abc12345deadbeef",
-            findings_file=findings_file,
-        )
-    pr_create_argv = mock_run.call_args_list[4][0][0]
-    title_index = pr_create_argv.index("--title")
-    title_value = pr_create_argv[title_index + 1]
-    assert title_value == "chore: address Copilot findings from PR #312"
-
-
-def test_should_return_trimmed_pr_url(tmp_path: Path) -> None:
-    findings_file = tmp_path / "findings.md"
-    findings_file.write_text("- Finding\n", encoding="utf-8")
-    payload_sequence = _scripted_subprocess_runs(
-        base_ref_payload=json.dumps({"baseRefName": "main"}),
-        new_pr_url="  https://github.com/acme/widget/pull/313  \n",
-    )
-    with patch("subprocess.run", side_effect=payload_sequence):
-        new_pr_url = open_followup_copilot_pr_module.open_followup_copilot_pr(
-            owner="acme",
-            repo="widget",
-            parent_number=312,
-            head="abc12345deadbeef",
-            findings_file=findings_file,
-        )
-    assert new_pr_url == "https://github.com/acme/widget/pull/313"
-
-
-def test_should_pass_repo_arg_to_gh_pr_view_for_base_ref(tmp_path: Path) -> None:
-    findings_file = tmp_path / "findings.md"
-    findings_file.write_text("- Finding\n", encoding="utf-8")
-    payload_sequence = _scripted_subprocess_runs(
-        base_ref_payload=json.dumps({"baseRefName": "main"}),
-        new_pr_url="https://github.com/acme/widget/pull/313\n",
-    )
-    with patch("subprocess.run", side_effect=payload_sequence) as mock_run:
-        open_followup_copilot_pr_module.open_followup_copilot_pr(
-            owner="acme",
-            repo="widget",
-            parent_number=312,
-            head="abc12345deadbeef",
-            findings_file=findings_file,
-        )
-    pr_view_argv = mock_run.call_args_list[0][0][0]
-    assert pr_view_argv[0:3] == ["gh", "pr", "view"]
-    assert "--repo" in pr_view_argv
-    repo_arg_value = pr_view_argv[pr_view_argv.index("--repo") + 1]
-    assert repo_arg_value == "acme/widget"
-
-
-def test_should_pass_repo_arg_to_gh_pr_create_for_followup_pr(
-    tmp_path: Path,
-) -> None:
-    findings_file = tmp_path / "findings.md"
-    findings_file.write_text("- Finding\n", encoding="utf-8")
-    payload_sequence = _scripted_subprocess_runs(
-        base_ref_payload=json.dumps({"baseRefName": "main"}),
-        new_pr_url="https://github.com/acme/widget/pull/313\n",
-    )
-    with patch("subprocess.run", side_effect=payload_sequence) as mock_run:
-        open_followup_copilot_pr_module.open_followup_copilot_pr(
-            owner="acme",
-            repo="widget",
-            parent_number=312,
-            head="abc12345deadbeef",
-            findings_file=findings_file,
-        )
-    pr_create_argv = mock_run.call_args_list[4][0][0]
-    assert pr_create_argv[0:3] == ["gh", "pr", "create"]
-    assert "--repo" in pr_create_argv
-    repo_arg_value = pr_create_argv[pr_create_argv.index("--repo") + 1]
-    assert repo_arg_value == "acme/widget"
-
-
-def test_should_raise_when_subprocess_fails(tmp_path: Path) -> None:
-    findings_file = tmp_path / "findings.md"
-    findings_file.write_text("- Finding\n", encoding="utf-8")
-    failure = subprocess.CalledProcessError(
-        returncode=1, cmd=["gh"], stderr="auth failure"
-    )
-    with patch("subprocess.run", side_effect=failure):
-        with pytest.raises(subprocess.CalledProcessError):
-            open_followup_copilot_pr_module.open_followup_copilot_pr(
-                owner="acme",
-                repo="widget",
-                parent_number=312,
-                head="abc12345",
-                findings_file=findings_file,
-            )

package/skills/pr-converge/test_team_lifecycle.py

@@ -1,56 +0,0 @@
-"""Markdown assertion tests for pr-converge orchestrator team lifecycle.
-
-Locks in the contract that pr-converge multi-PR orchestration must:
-  - own a single long-lived team for the whole sweep
-  - pass that team to every bugteam invocation via attach mode
-  - tear down only when every PR reaches `converged` or `blocked`
-"""
-
-from __future__ import annotations
-
-import pathlib
-
-
-def _skill_text() -> str:
-    here = pathlib.Path(__file__).parent
-    return (here / "SKILL.md").read_text(encoding="utf-8")
-
-
-def test_skill_documents_orchestrator_owned_team_in_multi_pr_mode():
-    skill_text = _skill_text()
-    assert "team_name" in skill_text
-    assert "TeamCreate" in skill_text
-    assert "orchestrator" in skill_text.lower()
-
-
-def test_skill_passes_attach_mode_to_bugteam_invocations():
-    skill_text = _skill_text()
-    assert "BUGTEAM_TEAM_LIFECYCLE" in skill_text
-    assert "attach" in skill_text
-    assert "BUGTEAM_TEAM_NAME" in skill_text
-
-
-def test_skill_tears_down_team_only_on_full_convergence():
-    skill_text = _skill_text()
-    assert "TeamDelete" in skill_text
-    convergence_phrases = [
-        "every PR",
-        "all PRs",
-        "fully converged",
-        "every prs[",
-    ]
-    assert any(phrase in skill_text for phrase in convergence_phrases)
-
-
-def test_state_schema_includes_team_name_field():
-    skill_text = _skill_text()
-    assert '"team_name"' in skill_text or "team_name:" in skill_text
-
-
-def test_skill_md_physical_lines_fit_eighty_column_limit():
-    skill_text = _skill_text()
-    for each_line_number, each_physical_line in enumerate(skill_text.splitlines(), 1):
-        assert len(each_physical_line) <= 80, (
-            "SKILL.md line %s exceeds 80 columns (%s chars)"
-            % (each_line_number, len(each_physical_line))
-        )

package/skills/pr-converge/workflows/ahk-auto-continue-loop.md

@@ -1,108 +0,0 @@
-# AHK auto-continue loop pacing (pr-converge)
-
-Load this document when **`ScheduleWakeup` is not available** in this session (orchestrated teams disabled, restricted tool registry, Cursor
-  without that primitive, or the user wants a visibly-running pacer). Follow it for **every** instruction below that depends on that choice.
-  Shared bugbot / bugteam / Fix protocol steps stay in the main `SKILL.md`.
-
-## Session behavior
-
-Keep ticks in the **same** window the auto-typer targets so each `continue` re-enters here and reads the same state line and `gh` context.
-
-## Why this path exists
-
-It is not a separate "mode" the user must remember — bare `/pr-converge` already implies loop-until-done; when the primary wakeup tool is
-  missing, fall through to AHK automatically. The per-tick work is unchanged; what changes is who fires the next tick. Instead of
-  `ScheduleWakeup` re-entering the skill, an external AutoHotkey utility auto-types `continue` into the active Claude Code window every 5
-  minutes, and the model treats each `continue` as the next tick trigger.
-
-**AHK is loop pacing only:** every `phase == BUGTEAM` tick still runs **`/bugteam`** via the bugteam skill per Step 2 of the main skill —
-  nothing here replaces that audit.
-
-**Fix protocol** commits use **`Task`** with **`subagent_type: "generalPurpose"`** and the **clean-coder preamble** from the main
-  [`SKILL.md` Fix protocol](../SKILL.md#fix-protocol) section (same as ScheduleWakeup pacing — Cursor has no `clean-coder` `subagent_type`).
-
-Ensure `~/.claude/agents/clean-coder.md` exists (Windows: `%USERPROFILE%\.claude\agents\clean-coder.md`). Optionally also copy it to
-  `.cursor/agents/clean-coder.md` in the repo when you want the file co-located with the checkout; the spawn **prompt** must still name the
-  absolute path the subagent should **Read** first.
-
-### One-time setup at the start of the loop
-
-The skill bundles its driver scripts under `scripts/` and resolves them at runtime via `$HOME\.claude\skills\pr-converge\scripts\…` (the same
-  convention `/logifix` uses). The bundled `.cmd` launchers locate their siblings via `%~dp0`, so they need no path arguments — only the AHK
-  target PID.
-
-Run these two commands in order (PowerShell-friendly Bash escaping):
-
-1. Resolve the PID of the GUI ancestor that hosts this Claude Code session:
-   ```bash
-   pwsh -NoProfile -ExecutionPolicy Bypass -File "$HOME\.claude\skills\pr-converge\scripts\caller-window-pid.ps1"
-   ```
-   Capture the printed integer as `caller_pid`. Verify it points at the right window before continuing:
-   ```bash
-   pwsh -NoProfile -Command "Get-Process -Id $caller_pid | Select-Object Id,ProcessName,MainWindowTitle"
-   ```
-2. Launch the auto-typer attached to that PID with auto-start enabled. The bundled launcher accepts the PID as its first arg and the
-  `--start-on` flag is forwarded to the AHK script:
-   ```bash
-   "$HOME\.claude\skills\pr-converge\scripts\cursor-agents-continue.cmd" $caller_pid --start-on
-   ```
-   AutoHotkey v2 must be installed at `C:\Program Files\AutoHotkey\v2\AutoHotkey64.exe`.
-
-### Per-tick behavior under this driver
-
-- Run Steps 1–3 of **Per-tick work** in the main `SKILL.md` exactly as written.
-- In **Step 4**, do **not** call `ScheduleWakeup` — the auto-typer is the pacer (this is the fallback branch of Step 4 in the main skill).
-- End every assistant response with the literal sentence `Awaiting next "continue" tick.` so the next iteration is unambiguously identifiable
-  in the transcript.
-- When the next user message is `continue` (auto-typed by AHK) or any close paraphrase, treat it as the next tick of default-loop
-  `/pr-converge` and re-enter from Step 1 against the freshest PR state.
-
-### Convergence cleanup
-
-On back-to-back clean (the existing convergence rule in the main skill), run `gh pr ready`, then kill the auto-typer when this session used
-  this AHK pacing path:
-
-```bash
-pwsh -NoProfile -Command "Get-CimInstance Win32_Process -Filter \"Name='AutoHotkey64.exe'\" | Where-Object CommandLine -like '*cursor-agents-continue.ahk*' | ForEach-Object { Stop-Process -Id $_.ProcessId -Force }"
-```
-
-Report convergence in the same one-sentence shape as the standard flow, plus a second sentence noting the auto-typer was stopped. The skill
-  returns; no next tick fires.
-
-### Gotchas
-
-- **Resolver fallback semantics matter.** `caller-window-pid.ps1` walks up the parent process chain, terminates at `explorer.exe`, and falls
-  back to the foreground window when no GUI ancestor is found. Always verify `MainWindowTitle` after capture — if it isn't the Claude Code
-  session, the auto-typer will fire `continue` into the wrong window and the loop stalls silently.
-- **Tick-duration vs. 5-minute cadence.** The auto-typer fires every 5 minutes regardless of model activity. A tick that runs longer than 5
-  minutes will receive a queued `continue` while still in flight; Claude Code processes these sequentially, so there's no corruption, but the
-  loop pace becomes irregular. Don't try to "fix" this by shortening the AHK interval — the `bugbot run` cadence already has its own pacing
-  baked into the standard flow.
-- **AHK runs as `#SingleInstance Force`.** Re-running the launcher replaces the prior instance silently. Safe to re-issue if the loop appears
-  stalled.
-- **`Stop-Process -Force` on `AutoHotkey64` is broad.** It kills every AHK instance, not just the one this skill started. When the user has
-  unrelated AHK utilities running, scope the kill by command-line match instead:
-  ```bash
-  pwsh -NoProfile -Command "Get-CimInstance Win32_Process -Filter \"Name='AutoHotkey64.exe'\" | Where-Object CommandLine -like '*cursor-agents-continue.ahk*' | ForEach-Object { Stop-Process -Id $_.ProcessId -Force }"
-  ```
-- **State-line responsibility is unchanged.** The state line (phase, bugbot_clean_at, inline_lag_streak, tick_count) is still emitted at the
-  end of every tick — it's how the next tick reads prior state. The auto-typer only fires `continue`; it does not preserve state for you.
-- **No `tick_count` ceiling.** `tick_count` is observability-only (same as the main skill and `state-schema.md`). This path ends on convergence or **Stop conditions** in `SKILL.md`, not on a tick counter.
-- **`/bugteam` is not optional for BUGTEAM ticks.** AHK only paces **when** the next tick runs; it does not replace the bugteam skill. Skipping
-  **`/bugteam`** after a clean Bugbot review breaks the back-to-back contract.
-- **Fix protocol:** use **`Task` + `generalPurpose`** with the clean-coder **Read** preamble from the main [`SKILL.md` Fix protocol](../SKILL.md#fix-protocol)
-  (never a bare `generalPurpose` production edit). Ensure the clean-coder agent markdown exists at `~/.claude/agents/clean-coder.md` (Windows:
-  `%USERPROFILE%\.claude\agents\clean-coder.md`); copy into `.cursor/agents/` only if you want a repo-local duplicate.
-
-## BUGBOT inline-lag (this path only)
-
-When Step 2 BUGBOT branch c routes to API lag and you are on **this** pacing path: complete Step 4 per **Per-tick behavior under this driver**
-  above (fixed AHK cadence — there is no 60s shortcut). The inline comments should appear on the next tick.
-
-## Convergence
-
-On back-to-back clean: stop the auto-typer per **Convergence cleanup** above; omit `ScheduleWakeup` (not used on this path).
-
-## Stop / safety (this path)
-
-On hard blockers or user stop: omit loop pacing and stop the AHK auto-typer if it was started, per main skill **Stop conditions**. Use the same **scoped** `Get-CimInstance` / `Stop-Process` command as **Convergence cleanup** (command-line match on `cursor-agents-continue.ahk`) so unrelated AutoHotkey instances are not killed.