claude-dev-env 1.32.0 → 1.33.0

package/skills/bugteam/scripts/bugteam_fix_hookspath.py

@@ -5,17 +5,29 @@ import subprocess
 import sys
 from pathlib import Path
 
+sys.modules.pop("config", None)
+if str(Path(__file__).resolve().parent) not in sys.path:
+    sys.path.insert(0, str(Path(__file__).resolve().parent))
+
+from config.bugteam_fix_hookspath_constants import (
+    ALL_CANONICAL_HOOKS_DIRECTORY_COMPONENTS,
+    ALL_HOME_ENV_VAR_NAMES,
+    HOOKS_PATH_SUFFIX,
+    PREFLIGHT_NO_PYTEST_FLAG,
+    PREFLIGHT_REPO_ROOT_FLAG,
+)
+
 
 def _expected_hooks_path_suffix() -> str:
-    return "hooks/git-hooks"
+    return HOOKS_PATH_SUFFIX
 
 
-def _canonical_hooks_directory_components() -> tuple[str, ...]:
-    return (".claude", "hooks", "git-hooks")
+def _canonical_hooks_directory_components() -> tuple[str, str, str]:
+    return ALL_CANONICAL_HOOKS_DIRECTORY_COMPONENTS
 
 
-def _home_env_var_names() -> tuple[str, ...]:
-    return ("HOME", "USERPROFILE")
+def _home_env_var_names() -> tuple[str, str]:
+    return ALL_HOME_ENV_VAR_NAMES
 
 
 def resolve_canonical_hooks_directory(
@@ -82,7 +94,7 @@ def read_global_core_hooks_path(
 def unset_local_core_hooks_path(
     repository_root: Path,
     environment_overrides: dict[str, str] | None,
-) -> None:
+) -> int:
     git_command = [
         "git",
         "-C",
@@ -92,13 +104,14 @@ def unset_local_core_hooks_path(
         "--unset-all",
         "core.hooksPath",
     ]
-    subprocess.run(
+    completed_process = subprocess.run(
         git_command,
         capture_output=True,
         text=True,
         check=False,
         env=environment_overrides,
     )
+    return completed_process.returncode
 
 
 def set_global_core_hooks_path(
@@ -144,8 +157,8 @@ def rerun_preflight(
     rerun_command = [
         sys.executable,
         str(preflight_script_path),
-        "--no-pytest",
-        "--repo-root",
+        PREFLIGHT_NO_PYTEST_FLAG,
+        PREFLIGHT_REPO_ROOT_FLAG,
         str(repository_root),
     ]
     completed_process = subprocess.run(
@@ -156,7 +169,7 @@ def rerun_preflight(
     return completed_process.returncode
 
 
-def parse_arguments(argv: list[str]) -> argparse.Namespace:
+def parse_arguments(argv: list[str] | None) -> argparse.Namespace:
     parser = argparse.ArgumentParser(
         description=(
             "Auto-fix core.hooksPath when bugteam preflight detects a stale override. "
@@ -178,7 +191,7 @@ def main(
     *,
     environment_overrides: dict[str, str] | None = None,
 ) -> int:
-    arguments = parse_arguments(sys.argv[1:] if argv is None else argv)
+    arguments = parse_arguments(argv)
     start_directory = Path.cwd()
     repository_root = (
         arguments.repo_root.resolve()
@@ -206,7 +219,16 @@ def main(
         for each_value in local_hooks_path_values
     )
     if has_non_canonical_local_override:
-        unset_local_core_hooks_path(repository_root, environment_overrides)
+        unset_local_returncode = unset_local_core_hooks_path(
+            repository_root, environment_overrides
+        )
+        if unset_local_returncode != 0:
+            print(
+                "bugteam_fix_hookspath: failed to unset local core.hooksPath on "
+                f"{repository_root} (git exit {unset_local_returncode}).",
+                file=sys.stderr,
+            )
+            return 1
         print(
             "bugteam_fix_hookspath: removed stale local core.hooksPath override on "
             f"{repository_root}",

package/skills/bugteam/scripts/config/bugteam_fix_hookspath_constants.py

@@ -0,0 +1,17 @@
+"""Configuration constants for bugteam_fix_hookspath auto-remediation script."""
+
+from __future__ import annotations
+
+HOOKS_PATH_SUFFIX: str = "hooks/git-hooks"
+
+ALL_CANONICAL_HOOKS_DIRECTORY_COMPONENTS: tuple[str, str, str] = (
+    ".claude",
+    "hooks",
+    "git-hooks",
+)
+
+ALL_HOME_ENV_VAR_NAMES: tuple[str, str] = ("HOME", "USERPROFILE")
+
+PREFLIGHT_NO_PYTEST_FLAG: str = "--no-pytest"
+
+PREFLIGHT_REPO_ROOT_FLAG: str = "--repo-root"

package/skills/rebase/SKILL.md

@@ -11,16 +11,23 @@ The default failure mode is shipping a rebase that compiled but doesn't run. Thi
 
 ## When to rebase vs. merge
 
+> **Decision thresholds**
+>
+> | Threshold | Value |
+> |---|---|
+> | Maximum commits for solo rebase | 5 |
+> | Divergence age that triggers merge-instead | 2 weeks |
+
 **Default to rebase** when:
 
 - Solo branch (you are the only author of the commits being rebased).
-- 1–5 commits ahead of base.
+- 1–5 commits ahead of base (see Decision thresholds above).
 - Stacked PR whose base just merged via squash.
 
 **Default to merge** when:
 
 - Branch has multiple authors (force-push would clobber their state).
-- More than ~5 commits or more than ~2 weeks of divergence (rebase complexity grows non-linearly).
+- More than 5 commits or more than 2 weeks of divergence (see Decision thresholds above; rebase complexity grows non-linearly).
 - The user said "merge", not "rebase".
 - Open PR with approving reviews already on the current SHA (force-push invalidates them).
 
@@ -74,10 +81,10 @@ When in doubt, ask. Both work; the choice affects history shape, not correctness
 6. **Audit auto-merged files.** Files that git merged without conflict markers are not automatically correct. After each commit applies, run:
 
    ```
-   git diff --name-only --diff-filter=M HEAD@{1}
+   git diff --name-only --diff-filter=M ORIG_HEAD
    ```
 
-   For each modified file with no conflict markers, eyeball the changes — auto-merge can produce duplicate blocks (when both sides added similar content) or silently drop content (when both sides removed adjacent lines). Pay extra attention to `config/`, `constants.*`, and `__init__.py` files where additions often sit near each other.
+   Use `ORIG_HEAD`, which git sets at rebase start; the reflog index `HEAD@{1}` shifts as each rebase step runs and is unreliable mid-rebase. For each modified file with no conflict markers, eyeball the changes — auto-merge can produce duplicate blocks (when both sides added similar content) or silently drop content (when both sides removed adjacent lines). Pay extra attention to `config/`, `constants.*`, and `__init__.py` files where additions often sit near each other.
 
 7. **At every conflict, take both sides' intent seriously.** Read both, then decide based on the post-rebase logical state. Do not reflex-pick HEAD or `origin/main`. Document the resolution reasoning in the commit message if it is non-obvious.
 
@@ -88,10 +95,10 @@ When in doubt, ask. Both work; the choice affects history shape, not correctness
 8. **Real import check.** For Python:
 
    ```
-   python -c "import <every_top_level_module_in_changed_packages>"
+   python -m compileall -q <package>
    ```
 
-   This catches the most common rebase failure: an import that survived the rebase pointing at a name the rebased commits removed or renamed.
+   Follow immediately with the test-collection step below. `compileall` catches import-time failures across every module file; combined with `--collect-only` it surfaces `NameError`, `AttributeError`, and `ImportError` cases that a syntax-only check misses.
 
 9. **Test collection.** `pytest --collect-only -q` on the changed packages catches NameError, AttributeError, and ImportError surfaces beyond plain imports.
 
@@ -102,7 +109,7 @@ When in doubt, ask. Both work; the choice affects history shape, not correctness
     - **Preferred:** `mcp__serena__find_referencing_symbols` (symbol-aware; ignores false matches in comments and string literals).
     - **Fallback:** `mcp__zoekt__search` for cross-repo or large trees.
     - **Then:** the `Grep` tool (e.g., `Grep(pattern="<symbol>", type="py")`) for fast in-repo scans.
-    - **Last resort:** `grep -rn "<symbol>" --include='*.py' --include='*.ts' --include='*.json' .`
+    - **Last resort:** `grep -rn "<symbol>" .` (let ripgrep defaults and `.gitignore` handle scoping)
 
     Any reference outside the rebased commits' own changes is a stale reference. Either update it (with user authorization) or surface it and refuse to push.
 
@@ -117,7 +124,7 @@ When in doubt, ask. Both work; the choice affects history shape, not correctness
     - Ask for explicit authorization.
     - If denied: leave the rebase result locally, report merge-instead as the alternative, stop.
 
-14. **Refuse to force-push** `main`, `master`, `release/*`, `production`, or any branch with more than one author in `git log --format='%ae' origin/<branch> | sort -u`. Surface the refusal; do not ask for authorization on these.
+14. **Refuse to force-push** `main`, `master`, `release/*`, `production`, or any branch with more than one unique author. Count unique authors in a cross-platform way: `git log --format='%ae' origin/<branch> | python -c "import sys; print(len(set(sys.stdin)))"`. This form works on both Windows (PowerShell) and Unix without shell pipeline extensions. Surface the refusal; do not ask for authorization on these.
 
 15. **Always `--force-with-lease=<branch>:<sha>`**, never bare `--force`. Pin the lease to the SHA you started from so concurrent pushes are detected as a lease mismatch instead of clobbered.