claude-dev-env 8.32.2 → 8.33.1

package/hooks/advisory/pr_done_reminder.py

@@ -31,7 +31,6 @@ Hosted by ``blocking/bash_post_call_dispatcher.py``, which forwards the
 from __future__ import annotations
 
 import json
-import shlex
 import subprocess
 import sys
 from pathlib import Path
@@ -64,9 +63,6 @@ try:
         GH_PR_CREATE_ACTION,
         GH_PR_SUBCOMMAND,
         ALL_GH_PR_VIEW_ARGUMENTS,
-        ALL_GIT_OPTIONS_WITH_VALUE,
-        ALL_POWERSHELL_COMMAND_FLAGS,
-        ALL_POWERSHELL_PROGRAM_NAMES,
         GH_PR_VIEW_TIMEOUT_SECONDS,
         GH_PROGRAM_NAME,
         GIT_PROGRAM_NAME,
@@ -86,9 +82,13 @@ try:
     )
     from hooks_constants.pre_tool_use_stdin import read_hook_input_dictionary_from_stdin
     from hooks_constants.shell_command_segments import (
-        effective_leading_program,
+        command_tokens,
+        git_subcommand_tokens,
         split_into_segments,
-        token_basename,
+    )
+    from hooks_constants.shell_command_wrappers import (
+        all_wrapped_command_texts,
+        segment_program_and_arguments,
     )
 except ImportError as import_error:
     raise ImportError(
@@ -97,47 +97,10 @@ except ImportError as import_error:
     ) from import_error
 
 
-def _command_tokens(command: str) -> list[str]:
-    try:
-        return shlex.split(command, posix=True)
-    except ValueError:
-        return command.split()
-
-
-def _segment_program_and_arguments(all_segment_tokens: list[str]) -> tuple[str, list[str]]:
-    program_token = effective_leading_program(all_segment_tokens)
-    if program_token is None:
-        return "", []
-    program_index = all_segment_tokens.index(program_token)
-    return token_basename(program_token), all_segment_tokens[program_index + 1 :]
-
-
-def _git_subcommand(all_arguments: list[str]) -> str | None:
-    """Return git's subcommand after its global options.
-
-    ``git -C <path> push`` and ``git -c <key=value> push`` carry an option
-    value before the subcommand; ``--git-dir=<path>`` carries none. The first
-    token left after those is the subcommand, so ``git stash push`` yields
-    ``stash`` and ``git log --grep push`` yields ``log``.
-    """
-    should_skip_next_token = False
-    for each_argument in all_arguments:
-        if should_skip_next_token:
-            should_skip_next_token = False
-            continue
-        if each_argument in ALL_GIT_OPTIONS_WITH_VALUE:
-            should_skip_next_token = True
-            continue
-        if each_argument.startswith("-"):
-            continue
-        return each_argument
-    return None
-
-
 def _is_git_push(program_name: str, all_arguments: list[str]) -> bool:
-    return (
-        program_name == GIT_PROGRAM_NAME and _git_subcommand(all_arguments) == GIT_PUSH_SUBCOMMAND
-    )
+    return program_name == GIT_PROGRAM_NAME and git_subcommand_tokens(all_arguments)[:1] == [
+        GIT_PUSH_SUBCOMMAND
+    ]
 
 
 def _is_gh_pr_create(program_name: str, all_arguments: list[str]) -> bool:
@@ -147,25 +110,6 @@ def _is_gh_pr_create(program_name: str, all_arguments: list[str]) -> bool:
     ]
 
 
-def _powershell_inner_commands(all_command_tokens: list[str]) -> list[str]:
-    """Return the script texts every ``pwsh -Command "..."`` wrapper runs.
-
-    Read from the raw shlex tokens, before segment splitting: the quoted
-    script is one token here, and splitting it on ``;`` first would cut a
-    ``git add -A; git push`` script in half.
-    """
-    all_inner_commands: list[str] = []
-    has_seen_powershell_program = False
-    for each_token_index, each_token in enumerate(all_command_tokens[:-1]):
-        if token_basename(each_token) in ALL_POWERSHELL_PROGRAM_NAMES:
-            has_seen_powershell_program = True
-            continue
-        if has_seen_powershell_program and each_token.lower() in ALL_POWERSHELL_COMMAND_FLAGS:
-            all_inner_commands.append(all_command_tokens[each_token_index + 1])
-            has_seen_powershell_program = False
-    return all_inner_commands
-
-
 def command_triggers_reminder(command: str) -> bool:
     """Return True when any segment of the command is a git push or a gh pr create.
 
@@ -175,16 +119,13 @@ def command_triggers_reminder(command: str) -> bool:
     Args:
         command: The Bash command text the agent ran.
     """
-    all_command_tokens = _command_tokens(command)
-    for each_inner_command in _powershell_inner_commands(all_command_tokens):
-        if command_triggers_reminder(each_inner_command):
-            return True
-    for each_segment in split_into_segments(all_command_tokens):
-        program_name, all_arguments = _segment_program_and_arguments(each_segment)
-        if _is_git_push(program_name, all_arguments) or _is_gh_pr_create(
-            program_name, all_arguments
-        ):
-            return True
+    for each_command_text in all_wrapped_command_texts(command):
+        for each_segment in split_into_segments(command_tokens(each_command_text)):
+            program_name, all_arguments = segment_program_and_arguments(each_segment)
+            if _is_git_push(program_name, all_arguments) or _is_gh_pr_create(
+                program_name, all_arguments
+            ):
+                return True
     return False
 
 

package/hooks/advisory/test_pr_done_reminder.py

@@ -95,9 +95,24 @@ def _additional_context(stdout_text: str) -> str:
         "git add -A && git commit -F m.txt && git push",
         "git -c push.default=current push",
         "git --git-dir=C:/repo/.git push",
+        "git --git-dir C:/repo/.git push",
+        "git --work-tree C:/repo push",
+        "git --namespace n push",
         'pwsh -NoProfile -Command "git push -u origin feat/x"',
         "pwsh -NoProfile -Command 'gh pr create --draft --fill'",
         'powershell -Command "git add -A; git push"',
+        "pwsh -Command git push origin HEAD",
+        "pwsh -Command git push origin HEAD; echo done",
+        "sudo git push",
+        'bash -c "git push"',
+        "sh -c 'git push'",
+        "bash -lc 'gh pr create --draft --fill'",
+        "env VAR=x git push",
+        "echo origin | xargs git push",
+        "git.exe push origin HEAD",
+        "env -u HOME git push",
+        "timeout --signal KILL 5 git push",
+        "echo origin | xargs -n 1 git push",
     ],
 )
 def test_should_wake_on_git_push_and_gh_pr_create(command: str) -> None:
@@ -116,6 +131,10 @@ def test_should_wake_on_git_push_and_gh_pr_create(command: str) -> None:
         "gh pr ready --undo",
         "echo git push",
         'pwsh -NoProfile -Command "git status"',
+        "pwsh -Command git status",
+        'bash -c "git status"',
+        "sudo cat notes.txt",
+        "rg 'git push' docs",
         "pytest tests/",
     ],
 )