claude-dev-env 1.92.1 → 1.93.0

package/rules/nas-ssh-invocation.md

@@ -1,6 +1,6 @@
 # NAS SSH Invocation Policy
 
-**When this applies:** Any `ssh`, `scp`, or `sftp` command against the NAS at `192.168.1.100`.
+**When this applies:** Any `ssh`, `scp`, or `sftp` command against the NAS.
 
 ## Rule
 
@@ -9,13 +9,15 @@ Reach the NAS through the Windows OpenSSH binary with batch mode on. Git Bash's
 Use this form for every NAS ssh command:
 
 ```
-"/c/Windows/System32/OpenSSH/ssh.exe" -o BatchMode=yes -o ConnectTimeout=10 -p 9222 jon@192.168.1.100 "<cmd>"
+"/c/Windows/System32/OpenSSH/ssh.exe" -o BatchMode=yes -o ConnectTimeout=10 -p 22 operator@nas.example.local "<cmd>"
 ```
 
-`scp` and `sftp` take the matching `System32/OpenSSH` binary, `-o BatchMode=yes`, and port `9222` (`-P` for `scp`).
+`scp` and `sftp` take the matching `System32/OpenSSH` binary, `-o BatchMode=yes`, and the same port (`-P` for `scp`).
+
+The host, ssh user, and port come from the `CLAUDE_NAS_*` environment variables or `~/.claude/local-identity.json`; the committed examples show placeholders (`nas.example.local`, `operator`, `22`).
 
 `-o BatchMode=yes` is required, not optional: it turns a key-authentication failure into a loud non-zero exit rather than a silent password prompt, so an auth regression surfaces as an error you can read.
 
 ## Enforcement
 
-`nas_ssh_binary_enforcer.py` (PreToolUse on Bash) denies a bare `ssh`/`scp`/`sftp` command word aimed at `192.168.1.100` and points at the full-binary form. It also denies the full `System32/OpenSSH` binary to that host when the command omits `-o BatchMode=yes`. Commands to any other host, and commands that mention the address without an ssh-family command word, pass.
+`nas_ssh_binary_enforcer.py` (PreToolUse on Bash) denies a bare `ssh`/`scp`/`sftp` command word aimed at the NAS host and points at the full-binary form. It also denies the full `System32/OpenSSH` binary to that host when the command omits `-o BatchMode=yes`. Commands to any other host, and commands that mention the address without an ssh-family command word, pass.

package/rules/no-justification-noise.md

@@ -0,0 +1,61 @@
+---
+paths:
+  - "**/*.md"
+---
+
+# No Justification Noise in Documentation
+
+**When this applies:** Any Write or Edit to a `.md` file.
+
+## Rule
+
+Markdown states what the system is and does, in facts a reader can act on. Cut any sentence whose only job is to say why a choice is good, or to restate a gain the reader already works out from the stated behavior or from a rule a hook or another file enforces. A sentence like that carries no new fact — it repeats one the reader already holds, so it earns no space.
+
+## The test
+
+For each sentence, ask: **does it state a fact the reader can act on that they could not already work out from the behavior around it or from a rule enforced elsewhere?** If no, cut the sentence.
+
+## Two shapes to catch
+
+### Pure noise — cut the whole sentence
+
+A sentence whose only job is to point out a result that follows from a fact the doc already states.
+
+> Autoconverge's bug-audit and self-review lenses and pr-converge's CODE_REVIEW step point at this file and read it when they run; they do not carry its text in their spawn prompts, so the checklist stays out of the per-round token budget.
+
+The doc already states the lenses read the file. The "so it stays out of the token budget" tail is a result the reader works out alone, so it carries nothing. Cut the sentence.
+
+### Load-bearing first, noise after — keep the fact, cut the rest
+
+A sentence that states a real fact, trailed by prose that only re-argues it or restates its payoff.
+
+> The pre-catch stage drives the code to clean against these five lanes before any external reviewer sees it. External reviewers (Cursor Bugbot, GitHub Copilot) are terminal confirmation gates that run only after every lane below is clean, and they are expected to return zero findings.
+
+Keep the first sentence — it states what the stage does. Cut the second: "run only after every lane below is clean" repeats the first sentence's claim, and "expected to return zero findings" is a hoped-for result, not a fact the reader acts on.
+
+## What stays
+
+- A fact the reader acts on: an input a piece of code takes, an order a producer emits, a path a script writes.
+- A rule's one-line reason stated in terms of present behavior — `--jq` runs per page, so cross-page sorts give wrong results — because that reason names a fact the reader needs to pick the right call.
+- A tradeoff or a constraint the reader weighs before choosing a path.
+
+## Sibling rules
+
+This rule sits beside three others; each cuts a different kind of dead prose.
+
+| Rule | Cuts |
+|---|---|
+| `no-historical-clutter.md` | references to old state (`previously`, `migrated from`) |
+| `self-contained-docs.md` | references to the chat that produced the doc |
+| `plain-language.md` | heavy words with an everyday swap |
+| `no-justification-noise.md` | a present-tense sentence that only justifies or restates a fact the reader already holds |
+
+`no-historical-clutter.md` keeps a rule's reason when the reason names present behavior; this rule keeps the same reason for the same test. The two agree: a reason that names a fact the reader acts on stays, and a sentence that only re-argues a stated fact goes.
+
+## Enforcement
+
+The AI review lane carries this rule: `AGENTS.md` names it as a finding an agent applies to the `.md` lines a PR changes. No hook backs it, because telling a justification sentence from a load-bearing one needs meaning a regex cannot read.
+
+## Why
+
+A sentence that repeats a fact the reader already holds costs reading time and pays back nothing.

package/scripts/test_setup_project_paths.py

@@ -89,7 +89,7 @@ class TestExclusionFilter:
         assert filtered == []
 
     def test_drops_path_with_dot_cache_segment(self) -> None:
-        all_candidates = ["C:\\Users\\jon\\.cache\\build"]
+        all_candidates = ["C:\\Users\\example\\.cache\\build"]
         filtered = setup.apply_exclusion_filter(all_candidates)
         assert filtered == []
 

package/skills/CLAUDE.md

@@ -17,7 +17,7 @@ Skills install to `~/.claude/skills/<skill-name>/` via `packages/claude-dev-env/
 
 ## Shared support code
 
-`_shared/` — support code used by more than one skill. It holds `pr-loop/`, which provides prompt templates and Python helper scripts shared between `bugteam` and `pr-converge`.
+`_shared/` — support code used by more than one skill. It holds `pr-loop/`, which provides prompt templates and Python helper scripts shared across the PR-loop skills, and `advisor/`, which provides the shared warm-advisor protocol used by `team-advisor` and `orchestrator`.
 
 ## Skill groups
 
@@ -26,8 +26,9 @@ Skills install to `~/.claude/skills/<skill-name>/` via `packages/claude-dev-env/
 - `implement` — structured implementation from an existing plan packet
 - `bdd-protocol` — BDD depth: Example Mapping, scenario quality, outside-in layout
 - `verified-build` — build + test loop that gates on a verifier verdict
-- `orchestrator` — turns the session into the advisor-orchestrator: it spawns executor subagents to do the code edits and test runs, and answers a blocked executor with a plan, correction, or stop
-- `orchestrator-refresh` — sub-skill fired by the `/orchestrator` loop to re-assert the executor-advisor discipline mid-run
+- `orchestrator` — turns the session into the advisor-orchestrator: it spawns executor subagents to do the code edits and test runs; hard decisions go to a shared advisor (Claude warm `session-advisor` via SendMessage; Grok self-as-advisor on the orchestrating session)
+- `orchestrator-refresh` — sub-skill fired by the `/orchestrator` loop to re-assert the host-matched shared-advisor discipline mid-run (Claude SendMessage; Grok self-as-advisor, no Agent spawn)
+- `team-advisor` — binds one advisor at the strongest reachable tier (Claude warm agent; Grok self-as-advisor) and consults it for a second opinion before a big decision, at completion, when stuck, or when reconsidering the approach
 
 **PR review and convergence**
 - `autoconverge` — autonomous single-run workflow that drives a PR to ready
@@ -42,6 +43,7 @@ Skills install to `~/.claude/skills/<skill-name>/` via `packages/claude-dev-env/
 - `pr-fix-protocol` — fix, reply, and resolve reviewer findings; the unresolved-thread sweep
 - `post-audit-findings` — publishes an audit pass as one GitHub PR review
 - `pr-loop-lifecycle` — opens and closes a PR-loop run (grant, teardown, PR description, revoke, report)
+- `pr-loop-cloud-transport` — six-step transport workflow that lets any PR-loop skill run in a session whose `gh` CLI is absent or cannot act on the PR (MCP schema load, origin/HEAD fix, identity rules, the gh-to-MCP substitution matrix, the Copilot status rule, and the post self-check)
 - `code` — strict-mode code generation session
 
 **Research and discovery**
@@ -57,6 +59,7 @@ Skills install to `~/.claude/skills/<skill-name>/` via `packages/claude-dev-env/
 - `session-tidy` — tidies the session folder
 - `bg-agent` — launches a background agent
 - `task-build` — gathers open tasks
+- `privacy-hygiene` — full-repo personal-data and secret sweep plus remediation guide
 - `update` — updates the dev-env package
 - `gh-paginate` — safe `gh api` pagination patterns
 - `fresh-branch` — creates a clean branch off main

package/skills/_shared/pr-loop/scripts/_path_resolver.py

@@ -98,7 +98,7 @@ def slugify_pr_identity(owner: str, repo: str, pr_number: int) -> str:
         pr_number: Pull request number.
 
     Returns:
-        Slugified token (e.g. 'jl-cmd-claude-code-config-pr-422').
+        Slugified token (e.g. 'jl-cmd-claude-dev-env-pr-422').
     """
     return MULTI_PR_SLUG_TEMPLATE.format(owner=owner, repo=repo, number=pr_number)
 
@@ -179,7 +179,7 @@ def diff_patch_path(
         loop_number: Current loop iteration.
 
     Returns:
-        Absolute path (e.g. '<run_temp>/jl-cmd-claude-code-config-pr-422/loop-3.patch').
+        Absolute path (e.g. '<run_temp>/jl-cmd-claude-dev-env-pr-422/loop-3.patch').
     """
     slug = slugify_pr_identity(owner, repo, pr_number)
     filename = DIFF_PATCH_TEMPLATE.format(loop=loop_number)

package/skills/_shared/pr-loop/scripts/build_audit_prompt.py

@@ -7,7 +7,7 @@ inline. <pr_description> carries the PR body text read from --pr-body-file,
 and stays empty when that argument is absent or the file cannot be read.
 
 Usage:
-  python scripts/build_audit_prompt.py --owner jl-cmd --repo claude-code-config --pr-number 422 --loop 1 --head-ref feat/branch --base-ref main --worktree-path <PATH> --run-temp-dir <PATH>
+  python scripts/build_audit_prompt.py --owner jl-cmd --repo claude-dev-env --pr-number 422 --loop 1 --head-ref feat/branch --base-ref main --worktree-path <PATH> --run-temp-dir <PATH>
 """
 
 from __future__ import annotations

package/skills/_shared/pr-loop/scripts/build_fix_prompt.py

@@ -4,7 +4,7 @@ Populates <bug> entries from findings JSON, plus <execution> checklist
 and <constraints>.
 
 Usage:
-  python scripts/build_fix_prompt.py --owner jl-cmd --repo claude-code-config --pr-number 422 --loop 1 --head-ref feat/branch --base-ref main --worktree-path <PATH> --findings-json <PATH>
+  python scripts/build_fix_prompt.py --owner jl-cmd --repo claude-dev-env --pr-number 422 --loop 1 --head-ref feat/branch --base-ref main --worktree-path <PATH> --findings-json <PATH>
 """
 
 from __future__ import annotations

package/skills/_shared/pr-loop/scripts/test__path_resolver.py

@@ -32,7 +32,7 @@ path_resolver = _load_path_resolver()
 def test_per_pr_workspace_returns_typed_structure_with_concrete_fields() -> None:
     run_temp_dir = Path("/tmp/bugteam-pr-422")
     workspace = path_resolver.per_pr_workspace(
-        run_temp_dir, "jl-cmd", "claude-code-config", 422
+        run_temp_dir, "jl-cmd", "claude-dev-env", 422
     )
     assert isinstance(workspace, path_resolver.PerPrWorkspace)
     assert isinstance(workspace.worktree, Path)
@@ -51,11 +51,11 @@ def test_per_pr_workspace_diff_patch_template_carries_loop_placeholder() -> None
 
 
 def test_per_pr_workspace_diff_patch_template_uses_forward_slashes() -> None:
-    run_temp_dir = Path("C:/Users/jon/AppData/Local/Temp/bugteam-pr-376")
+    run_temp_dir = Path("C:/Users/example/AppData/Local/Temp/bugteam-pr-376")
     workspace = path_resolver.per_pr_workspace(run_temp_dir, "owner", "repo", 376)
     assert "\\" not in workspace.diff_patch_template
     assert workspace.diff_patch_template == (
-        "C:/Users/jon/AppData/Local/Temp/bugteam-pr-376/"
+        "C:/Users/example/AppData/Local/Temp/bugteam-pr-376/"
         "pr-376/owner-repo-pr-376/loop-{loop}.patch"
     )
 
@@ -65,3 +65,42 @@ def test_per_pr_workspace_is_frozen() -> None:
     workspace = path_resolver.per_pr_workspace(run_temp_dir, "owner", "repo", 9)
     with pytest.raises(dataclasses.FrozenInstanceError):
         workspace.worktree = Path("/tmp/other")
+
+
+def test_sanitize_branch_name_replaces_filesystem_unsafe_characters() -> None:
+    assert path_resolver.sanitize_branch_name("feat/my-branch") == "feat-my-branch"
+
+
+def test_build_run_name_uses_pr_number_for_single_pr() -> None:
+    assert path_resolver.build_run_name(422, "feat/x", is_multi_pr=False) == "bugteam-pr-422"
+
+
+def test_build_run_name_uses_sanitized_branch_for_multi_pr() -> None:
+    assert path_resolver.build_run_name(422, "feat/x", is_multi_pr=True) == "bugteam-feat-x"
+
+
+def test_slugify_pr_identity_joins_owner_repo_and_number() -> None:
+    assert (
+        path_resolver.slugify_pr_identity("jl-cmd", "claude-dev-env", 422)
+        == "jl-cmd-claude-dev-env-pr-422"
+    )
+
+
+def test_outcome_xml_path_embeds_pr_and_loop() -> None:
+    worktree_path = Path("/tmp/worktree")
+    outcome_path = path_resolver.outcome_xml_path(worktree_path, 422, 3)
+    assert outcome_path == worktree_path / ".bugteam-pr422-loop3.outcomes.xml"
+
+
+def test_fix_outcome_xml_path_embeds_pr_and_loop() -> None:
+    worktree_path = Path("/tmp/worktree")
+    fix_outcome_path = path_resolver.fix_outcome_xml_path(worktree_path, 422, 3)
+    assert fix_outcome_path == worktree_path / ".bugteam-pr422-loop3.fix-outcomes.xml"
+
+
+def test_diff_patch_path_joins_slug_and_loop_filename() -> None:
+    run_temp_dir = Path("/tmp/run")
+    patch_path = path_resolver.diff_patch_path(
+        run_temp_dir, "owner", "repo", 7, 2
+    )
+    assert patch_path == run_temp_dir / "owner-repo-pr-7" / "loop-2.patch"

package/skills/_shared/pr-loop/scripts/test_build_audit_prompt.py

@@ -50,7 +50,7 @@ def _rubric_label_by_letter() -> dict[str, str]:
 def _build_audit_root() -> Element:
     return build_audit_prompt.build_audit_prompt_xml(
         owner="jl-cmd",
-        repo="claude-code-config",
+        repo="claude-dev-env",
         pr_number=422,
         loop=1,
         head_ref="feat/branch",
@@ -63,25 +63,25 @@ def _build_audit_root() -> Element:
 def test_context_and_scope_render_paths_with_forward_slashes() -> None:
     root = build_audit_prompt.build_audit_prompt_xml(
         owner="jl-cmd",
-        repo="claude-code-config",
+        repo="claude-dev-env",
         pr_number=376,
         loop=1,
         head_ref="feat/branch",
         base_ref="main",
-        worktree_path=Path("C:/Users/jon/AppData/Local/Temp/bugteam-pr-376/worktree"),
-        run_temp_dir=Path("C:/Users/jon/AppData/Local/Temp/bugteam-pr-376"),
+        worktree_path=Path("C:/Users/example/AppData/Local/Temp/bugteam-pr-376/worktree"),
+        run_temp_dir=Path("C:/Users/example/AppData/Local/Temp/bugteam-pr-376"),
     )
     context = root.find("context")
     assert context is not None
     worktree_text = context.findtext("worktree_path")
     run_temp_text = context.findtext("run_temp_dir")
-    assert worktree_text == "C:/Users/jon/AppData/Local/Temp/bugteam-pr-376/worktree"
-    assert run_temp_text == "C:/Users/jon/AppData/Local/Temp/bugteam-pr-376"
+    assert worktree_text == "C:/Users/example/AppData/Local/Temp/bugteam-pr-376/worktree"
+    assert run_temp_text == "C:/Users/example/AppData/Local/Temp/bugteam-pr-376"
     scope = root.find("scope")
     assert scope is not None
     assert scope.text is not None
     assert "\\" not in scope.text
-    assert "C:/Users/jon/AppData/Local/Temp/bugteam-pr-376/worktree" in scope.text
+    assert "C:/Users/example/AppData/Local/Temp/bugteam-pr-376/worktree" in scope.text
 
 
 def test_bug_categories_carry_ids_a_through_q_in_order() -> None:
@@ -179,7 +179,7 @@ def test_bug_categories_include_category_q() -> None:
 def test_pr_description_carries_body_text_when_supplied() -> None:
     root = build_audit_prompt.build_audit_prompt_xml(
         owner="jl-cmd",
-        repo="claude-code-config",
+        repo="claude-dev-env",
         pr_number=422,
         loop=1,
         head_ref="feat/branch",
@@ -218,7 +218,7 @@ def test_read_pr_body_text_returns_none_when_file_missing(tmp_path: Path) -> Non
 def test_emit_audit_prompt_embeds_pr_body_text_in_pr_description() -> None:
     xml_text = build_audit_prompt.emit_audit_prompt(
         owner="jl-cmd",
-        repo="claude-code-config",
+        repo="claude-dev-env",
         pr_number=422,
         loop=1,
         head_ref="feat/branch",
@@ -233,7 +233,7 @@ def test_emit_audit_prompt_embeds_pr_body_text_in_pr_description() -> None:
 def test_parse_arguments_defaults_pr_body_file_to_none() -> None:
     arguments = build_audit_prompt.parse_arguments([
         "--owner", "jl-cmd",
-        "--repo", "claude-code-config",
+        "--repo", "claude-dev-env",
         "--pr-number", "422",
         "--loop", "1",
         "--head-ref", "feat/branch",
@@ -247,7 +247,7 @@ def test_parse_arguments_defaults_pr_body_file_to_none() -> None:
 def test_parse_arguments_reads_pr_body_file_path() -> None:
     arguments = build_audit_prompt.parse_arguments([
         "--owner", "jl-cmd",
-        "--repo", "claude-code-config",
+        "--repo", "claude-dev-env",
         "--pr-number", "422",
         "--loop", "1",
         "--head-ref", "feat/branch",

package/skills/_shared/pr-loop/scripts/test_build_fix_prompt.py

@@ -35,15 +35,38 @@ def test_context_worktree_path_renders_with_forward_slashes(tmp_path: Path) -> N
     )
     root = build_fix_prompt.build_fix_prompt_xml(
         owner="jl-cmd",
-        repo="claude-code-config",
+        repo="claude-dev-env",
         pr_number=376,
         loop=1,
         head_ref="feat/branch",
         base_ref="main",
-        worktree_path=Path("C:/Users/jon/AppData/Local/Temp/bugteam-pr-376/worktree"),
+        worktree_path=Path("C:/Users/example/AppData/Local/Temp/bugteam-pr-376/worktree"),
         findings_json_path=findings_json_path,
     )
     context = root.find("context")
     assert context is not None
     worktree_text = context.findtext("worktree_path")
-    assert worktree_text == "C:/Users/jon/AppData/Local/Temp/bugteam-pr-376/worktree"
+    assert worktree_text == "C:/Users/example/AppData/Local/Temp/bugteam-pr-376/worktree"
+
+
+def test_emit_fix_prompt_returns_xml_string_with_worktree_path(tmp_path: Path) -> None:
+    findings_json_path = tmp_path / "findings.json"
+    findings_json_path.write_text(
+        json.dumps([{"severity": "P1", "file": "a.py", "line": 1}]),
+        encoding="utf-8",
+    )
+    worktree_path = Path("C:/Users/example/AppData/Local/Temp/bugteam-pr-376/worktree")
+    xml_text = build_fix_prompt.emit_fix_prompt(
+        owner="jl-cmd",
+        repo="claude-dev-env",
+        pr_number=376,
+        loop=1,
+        head_ref="feat/branch",
+        base_ref="main",
+        worktree_path=worktree_path,
+        findings_json_path=findings_json_path,
+    )
+    assert isinstance(xml_text, str)
+    assert "C:/Users/example/AppData/Local/Temp/bugteam-pr-376/worktree" in xml_text
+    assert 'role="fix"' in xml_text
+    assert "<spawn_prompt" in xml_text

package/skills/_shared/pr-loop/scripts/test_preflight_worktree.py

@@ -29,7 +29,7 @@ def _load_preflight() -> ModuleType:
 preflight = _load_preflight()
 
 GIT_TIMEOUT = 30
-CLAUDE_REMOTE = "https://github.com/jl-cmd/claude-code-config.git"
+CLAUDE_REMOTE = "https://github.com/jl-cmd/claude-dev-env.git"
 GIT_CEILING_DIRECTORIES = "GIT_CEILING_DIRECTORIES"
 
 
@@ -68,20 +68,20 @@ def _init_repo(repo_dir: Path, origin_url: str | None) -> Path:
     ("remote_url", "expected_owner", "expected_repo"),
     [
         (
-            "https://github.com/jl-cmd/claude-code-config.git",
+            "https://github.com/jl-cmd/claude-dev-env.git",
             "jl-cmd",
-            "claude-code-config",
+            "claude-dev-env",
         ),
         (
-            "https://github.com/jl-cmd/claude-code-config",
+            "https://github.com/jl-cmd/claude-dev-env",
             "jl-cmd",
-            "claude-code-config",
+            "claude-dev-env",
         ),
-        ("git@github.com:JonEcho/llm-settings.git", "jonecho", "llm-settings"),
+        ("git@github.com:Example/llm-settings.git", "example", "llm-settings"),
         (
-            "ssh://git@github.com/jl-cmd/Claude-Code-Config",
+            "ssh://git@github.com/jl-cmd/Claude-Dev-Env",
             "jl-cmd",
-            "claude-code-config",
+            "claude-dev-env",
         ),
         ("https://github.com/jl-cmd/repo/", "jl-cmd", "repo"),
     ],
@@ -103,9 +103,33 @@ def test_parse_repo_identity_rejects_non_github_remotes(remote_url: str) -> None
     assert preflight.parse_repo_identity(remote_url) is None
 
 
+def test_is_inside_work_tree_true_in_git_repo(tmp_path: Path) -> None:
+    repo_dir = _init_repo(tmp_path / "session", None)
+    assert preflight.is_inside_work_tree(repo_dir) is True
+
+
+def test_is_inside_work_tree_false_in_plain_directory(tmp_path: Path) -> None:
+    plain_dir = tmp_path / "home"
+    plain_dir.mkdir()
+    assert preflight.is_inside_work_tree(plain_dir) is False
+
+
+def test_worktree_machinery_is_healthy_true_in_git_repo(tmp_path: Path) -> None:
+    repo_dir = _init_repo(tmp_path / "session", None)
+    assert preflight.worktree_machinery_is_healthy(repo_dir) is True
+
+
+def test_worktree_machinery_is_healthy_false_in_plain_directory(
+    tmp_path: Path,
+) -> None:
+    plain_dir = tmp_path / "home"
+    plain_dir.mkdir()
+    assert preflight.worktree_machinery_is_healthy(plain_dir) is False
+
+
 def test_classify_same_repo_when_origin_matches_pr(tmp_path: Path) -> None:
     repo_dir = _init_repo(tmp_path / "session", CLAUDE_REMOTE)
-    pr_identity = preflight.RepoIdentity("jl-cmd", "claude-code-config")
+    pr_identity = preflight.RepoIdentity("jl-cmd", "claude-dev-env")
     verdict = preflight.classify_environment(repo_dir, pr_identity)
     assert verdict.outcome == preflight.OUTCOME_SAME_REPO
     assert verdict.cwd_identity == pr_identity
@@ -116,17 +140,17 @@ def test_classify_different_repo_when_origin_is_another_github_repo(
     tmp_path: Path,
 ) -> None:
     repo_dir = _init_repo(
-        tmp_path / "session", "https://github.com/jonecho/llm-settings.git"
+        tmp_path / "session", "https://github.com/example/llm-settings.git"
     )
-    pr_identity = preflight.RepoIdentity("jl-cmd", "claude-code-config")
+    pr_identity = preflight.RepoIdentity("jl-cmd", "claude-dev-env")
     verdict = preflight.classify_environment(repo_dir, pr_identity)
     assert verdict.outcome == preflight.OUTCOME_DIFFERENT_REPO
-    assert verdict.cwd_identity == preflight.RepoIdentity("jonecho", "llm-settings")
+    assert verdict.cwd_identity == preflight.RepoIdentity("example", "llm-settings")
 
 
 def test_classify_different_repo_when_origin_is_non_github(tmp_path: Path) -> None:
     repo_dir = _init_repo(tmp_path / "session", "https://gitlab.com/foo/bar.git")
-    pr_identity = preflight.RepoIdentity("jl-cmd", "claude-code-config")
+    pr_identity = preflight.RepoIdentity("jl-cmd", "claude-dev-env")
     verdict = preflight.classify_environment(repo_dir, pr_identity)
     assert verdict.outcome == preflight.OUTCOME_DIFFERENT_REPO
     assert verdict.cwd_identity is None
@@ -134,7 +158,7 @@ def test_classify_different_repo_when_origin_is_non_github(tmp_path: Path) -> No
 
 def test_classify_re_rooted_when_origin_is_absent(tmp_path: Path) -> None:
     repo_dir = _init_repo(tmp_path / "session", None)
-    pr_identity = preflight.RepoIdentity("jl-cmd", "claude-code-config")
+    pr_identity = preflight.RepoIdentity("jl-cmd", "claude-dev-env")
     verdict = preflight.classify_environment(repo_dir, pr_identity)
     assert verdict.outcome == preflight.OUTCOME_RE_ROOTED
 
@@ -144,7 +168,7 @@ def test_classify_re_rooted_when_directory_is_not_a_work_tree(
 ) -> None:
     plain_dir = tmp_path / "home"
     plain_dir.mkdir()
-    pr_identity = preflight.RepoIdentity("jl-cmd", "claude-code-config")
+    pr_identity = preflight.RepoIdentity("jl-cmd", "claude-dev-env")
     verdict = preflight.classify_environment(plain_dir, pr_identity)
     assert verdict.outcome == preflight.OUTCOME_RE_ROOTED
     assert verdict.has_healthy_worktree_machinery is False
@@ -177,10 +201,10 @@ def test_decide_exit_code_matrix(
 def test_build_report_lines_marks_outcome_and_routes_cross_repo() -> None:
     verdict = preflight.PreflightVerdict(
         outcome=preflight.OUTCOME_DIFFERENT_REPO,
-        cwd_identity=preflight.RepoIdentity("jonecho", "llm-settings"),
+        cwd_identity=preflight.RepoIdentity("example", "llm-settings"),
         has_healthy_worktree_machinery=True,
     )
-    pr_identity = preflight.RepoIdentity("jl-cmd", "claude-code-config")
+    pr_identity = preflight.RepoIdentity("jl-cmd", "claude-dev-env")
     classify_lines = preflight.build_report_lines(
         verdict, "classify", Path("/tmp/x"), pr_identity
     )
@@ -195,10 +219,10 @@ def test_build_report_lines_marks_outcome_and_routes_cross_repo() -> None:
 def test_build_report_lines_aborts_on_broken_worktree_machinery() -> None:
     verdict = preflight.PreflightVerdict(
         outcome=preflight.OUTCOME_SAME_REPO,
-        cwd_identity=preflight.RepoIdentity("jl-cmd", "claude-code-config"),
+        cwd_identity=preflight.RepoIdentity("jl-cmd", "claude-dev-env"),
         has_healthy_worktree_machinery=False,
     )
-    pr_identity = preflight.RepoIdentity("jl-cmd", "claude-code-config")
+    pr_identity = preflight.RepoIdentity("jl-cmd", "claude-dev-env")
     lines = preflight.build_report_lines(verdict, "strict", Path("/tmp/x"), pr_identity)
     assert lines[0] == "PREFLIGHT_OUTCOME=same_repo"
     assert any("git worktree prune" in line for line in lines)
@@ -210,7 +234,7 @@ def test_main_strict_passes_in_matching_repo(
     repo_dir = _init_repo(tmp_path / "session", CLAUDE_REMOTE)
     monkeypatch.chdir(repo_dir)
     exit_code = preflight.main(
-        ["--owner", "jl-cmd", "--repo", "claude-code-config", "--mode", "strict"]
+        ["--owner", "jl-cmd", "--repo", "claude-dev-env", "--mode", "strict"]
     )
     captured = capsys.readouterr()
     assert exit_code == preflight.EXIT_PREFLIGHT_OK
@@ -221,11 +245,11 @@ def test_main_strict_aborts_when_session_rooted_in_other_repo(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
     repo_dir = _init_repo(
-        tmp_path / "session", "https://github.com/jonecho/llm-settings.git"
+        tmp_path / "session", "https://github.com/example/llm-settings.git"
     )
     monkeypatch.chdir(repo_dir)
     exit_code = preflight.main(
-        ["--owner", "jl-cmd", "--repo", "claude-code-config", "--mode", "strict"]
+        ["--owner", "jl-cmd", "--repo", "claude-dev-env", "--mode", "strict"]
     )
     captured = capsys.readouterr()
     assert exit_code == preflight.EXIT_PREFLIGHT_ABORT
@@ -237,11 +261,11 @@ def test_main_classify_routes_cross_repo_without_abort(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
     repo_dir = _init_repo(
-        tmp_path / "session", "https://github.com/jonecho/llm-settings.git"
+        tmp_path / "session", "https://github.com/example/llm-settings.git"
     )
     monkeypatch.chdir(repo_dir)
     exit_code = preflight.main(
-        ["--owner", "jl-cmd", "--repo", "claude-code-config", "--mode", "classify"]
+        ["--owner", "jl-cmd", "--repo", "claude-dev-env", "--mode", "classify"]
     )
     captured = capsys.readouterr()
     assert exit_code == preflight.EXIT_PREFLIGHT_OK
@@ -256,7 +280,7 @@ def test_main_classify_aborts_when_re_rooted(
     plain_dir.mkdir()
     monkeypatch.chdir(plain_dir)
     exit_code = preflight.main(
-        ["--owner", "jl-cmd", "--repo", "claude-code-config", "--mode", "classify"]
+        ["--owner", "jl-cmd", "--repo", "claude-dev-env", "--mode", "classify"]
     )
     captured = capsys.readouterr()
     assert exit_code == preflight.EXIT_PREFLIGHT_ABORT

package/skills/autoconverge/CLAUDE.md

@@ -2,7 +2,7 @@
 
 **Trigger:** `/autoconverge`, "autoconverge this PR", "converge this PR in one run", "run the converge workflow", "drive the PR to ready autonomously".
 
-Drives one draft PR to convergence in a single autonomous workflow run. Each round runs Cursor Bugbot, a code-review pass, and a bug-audit in parallel on the same HEAD, deduplicates findings, applies every fix in one commit, re-verifies, clears a Copilot wait-gate, and marks the PR ready on convergence. State lives in the workflow journal; no `ScheduleWakeup` ticks.
+Drives one draft PR to convergence in a single autonomous workflow run. Each round runs a deterministic static sweep first, then a code-review pass, a bug-audit (with its adversarial second pass), and a self-review parity pass in parallel on the same HEAD, deduplicates findings, applies every fix in one commit, and re-verifies. Once the internal lenses are clean, Cursor Bugbot and Copilot run as terminal confirmation gates, and the run marks the PR ready on convergence. State lives in the workflow journal; no `ScheduleWakeup` ticks.
 
 ## Subdirectories
 
@@ -16,11 +16,11 @@ Drives one draft PR to convergence in a single autonomous workflow run. Each rou
 | File | Role |
 |---|---|
 | `SKILL.md` | Full entry-point protocol: pre-flight steps, worktree setup, `Workflow` call, budget-aware round boundaries, teardown, and the per-round convergence loop summary. |
-| `workflow/converge.mjs` | Main convergence workflow. Runs rounds, gates on Copilot, checks convergence, and marks the PR ready. |
+| `workflow/converge.mjs` | Main convergence workflow. Runs a static sweep then the internal lenses each round, applies fixes, runs Bugbot and Copilot as terminal gates, checks convergence, and marks the PR ready. |
 | `workflow/aggregate_runs.py` | Merges every autoconverge journal for a PR into one deduped journal. |
 | `workflow/convergence_summary.py` | Builds the convergence-summary agent prompt over the merged findings. |
 | `workflow/render_report.py` | Builds the closing HTML report from the merged journal and summary. |
-| `reference/convergence.md` | Round shape: the three parallel lenses, deduplication, fix commit, and the ready definition. |
+| `reference/convergence.md` | Round shape: the static sweep, the three parallel internal lenses, deduplication, fix commit, the terminal Bugbot and Copilot gates, and the ready definition. |
 | `reference/stop-conditions.md` | Every way the run ends short of ready. |
 | `reference/gotchas.md` | Hard-won failure lessons. |
 | `reference/closing-report.md` | Specification for the closing HTML report format. |