claude-dev-env 1.89.0 → 1.90.0

package/hooks/blocking/volatile_path_in_post_blocker.py

@@ -0,0 +1,351 @@
+#!/usr/bin/env python3
+"""PreToolUse hook: block durable GitHub posts that reference volatile paths.
+
+Root cause: a background job posted a PR comment citing an artifact under a job
+scratch directory. Job tmp dirs, worktrees, and system temp locations are
+ephemeral — they are cleaned soon after the run — while a posted comment, PR
+body, issue, or review lives forever. A durable post that points at ephemeral
+scratch breaks the moment that scratch is removed.
+
+Detection strategy: gather the post body text from the tool call, then scan it
+for volatile-path markers. Two tool families carry post bodies: shell ``gh``
+post subcommands (``pr create/comment/edit/review``, ``issue
+create/comment/edit``) and the GitHub MCP post tools (any
+``mcp__plugin_github_github__*`` tool that carries a ``body`` or ``comment``
+parameter). For a ``gh`` command the body comes from ``--body``/``-b`` inline
+strings and from the file named by ``--body-file``/``-F`` (its contents are read
+and scanned, since that content is what gets embedded in the post). The ``gh``
+command is tokenized with ``shlex.split`` and the ``gh`` word must be the first
+command token, so a ``gh pr comment`` that only appears as quoted data inside
+another argument never classifies.
+"""
+
+import json
+import shlex
+import sys
+from pathlib import Path
+
+_hooks_dir = str(Path(__file__).resolve().parent.parent)
+if _hooks_dir not in sys.path:
+    sys.path.insert(0, _hooks_dir)
+
+from blocking._gh_body_arg_utils import (  # noqa: E402
+    all_body_flags,
+    body_file_flag,
+    body_file_short_flag,
+    count_extra_tokens_to_skip_for_split_quoted_value,
+    get_logical_first_line,
+    is_unresolvable_shell_value,
+    match_body_file_equals_prefix,
+    match_body_flag_equals_prefix,
+    strip_surrounding_quotes,
+)
+from hooks_constants.hook_block_logger import log_hook_block  # noqa: E402
+from hooks_constants.volatile_path_in_post_blocker_constants import (  # noqa: E402
+    ALL_GH_POST_SUBCOMMANDS,
+    ALL_MCP_BODY_PARAM_NAMES,
+    ALL_VOLATILE_PATH_MARKERS,
+    BASH_TOOL_NAME,
+    BODY_FILE_ENCODING,
+    CORRECTIVE_MESSAGE,
+    GH_COMMAND_NAME,
+    MCP_GITHUB_TOOL_PREFIX,
+    MINIMUM_POST_SUBCOMMAND_TOKEN_COUNT,
+    TOKEN_JOIN_SEPARATOR,
+)
+
+
+def scan_text_for_volatile_marker(text: str) -> str | None:
+    """Return the first volatile-path marker found in text, or None.
+
+    Backslashes normalize to forward slashes and the text lowercases before the
+    scan, so a marker matches regardless of slash direction or letter case::
+
+        ok:   "See the log table pasted below."        -> None
+        flag: r"C:\\Users\\me\\.claude-editor\\jobs\\x" -> ".claude-editor/jobs/"
+
+    Env-token markers such as ``%TEMP%`` and ``$CLAUDE_JOB_DIR`` match on the
+    same lowercased text.
+
+    Args:
+        text: The post body text to scan.
+
+    Returns:
+        The matched marker string, or None when the text names no volatile path.
+    """
+    normalized_text = text.replace("\\", "/").lower()
+    for each_marker in ALL_VOLATILE_PATH_MARKERS:
+        if each_marker in normalized_text:
+            return each_marker
+    return None
+
+
+def _is_environment_assignment(token: str) -> bool:
+    """Return whether a token is a ``NAME=value`` shell environment assignment."""
+    equals_index = token.find("=")
+    if equals_index <= 0:
+        return False
+    name_part = token[:equals_index]
+    if not (name_part[0].isalpha() or name_part[0] == "_"):
+        return False
+    return all(
+        each_character.isalnum() or each_character == "_"
+        for each_character in name_part
+    )
+
+
+def _tokens_name_gh_post_command(all_command_tokens: list[str]) -> bool:
+    """Return whether the tokens start with an affected ``gh`` post subcommand.
+
+    Leading ``NAME=value`` env assignments are skipped, then the next token must
+    be the literal ``gh`` command word followed by a post noun and verb. Anchoring
+    to the first command word keeps a ``gh pr comment`` mentioned only as quoted
+    argument data from classifying.
+
+    Args:
+        all_command_tokens: The shlex-split tokens of the logical command line.
+
+    Returns:
+        True when the command invokes an affected ``gh`` post subcommand.
+    """
+    command_index = 0
+    while command_index < len(all_command_tokens) and _is_environment_assignment(
+        all_command_tokens[command_index]
+    ):
+        command_index += 1
+    if command_index >= len(all_command_tokens):
+        return False
+    if all_command_tokens[command_index] != GH_COMMAND_NAME:
+        return False
+    remaining_tokens = all_command_tokens[command_index + 1 :]
+    if len(remaining_tokens) < MINIMUM_POST_SUBCOMMAND_TOKEN_COUNT:
+        return False
+    post_noun = remaining_tokens[0]
+    post_verb = remaining_tokens[1]
+    return post_verb in ALL_GH_POST_SUBCOMMANDS.get(post_noun, frozenset())
+
+
+def _reassemble_split_quoted_value(
+    value_token: str, all_following_tokens: list[str]
+) -> tuple[str, int]:
+    """Rejoin a quoted value that ``shlex.split(posix=False)`` split on spaces.
+
+    ``posix=False`` keeps backslashes intact (so Windows paths survive) but
+    splits a quoted value such as ``"dump in %TEMP%"`` into three tokens. This
+    rejoins the value token with the follow-on tokens up to the closing quote,
+    then strips the surrounding quotes so the full body text can be scanned.
+
+    Args:
+        value_token: The first token of the value, following the flag.
+        all_following_tokens: The tokens after ``value_token`` on the line.
+
+    Returns:
+        A ``(full_value, extra_tokens_consumed)`` pair; ``extra_tokens_consumed``
+        counts the follow-on tokens joined into the value.
+    """
+    extra_tokens = count_extra_tokens_to_skip_for_split_quoted_value(
+        all_following_tokens, value_token
+    )
+    if not extra_tokens:
+        return strip_surrounding_quotes(value_token), 0
+    joined_value = value_token + TOKEN_JOIN_SEPARATOR + TOKEN_JOIN_SEPARATOR.join(
+        all_following_tokens[:extra_tokens]
+    )
+    return strip_surrounding_quotes(joined_value), extra_tokens
+
+
+def _extract_flag_value_at(
+    all_command_tokens: list[str], token_index: int
+) -> tuple[bool, str, int] | None:
+    """Return a body/body-file value starting at token_index, or None.
+
+    Args:
+        all_command_tokens: The shlex-split tokens of the logical command line.
+        token_index: The index of the token to inspect.
+
+    Returns:
+        An ``(is_body_file, value, next_index)`` triple when the token opens a
+        body or body-file flag, else None. ``next_index`` is where scanning
+        resumes after the value's tokens.
+    """
+    current_token = all_command_tokens[token_index]
+    following_tokens = all_command_tokens[token_index + 1:]
+    body_equals_prefix = match_body_flag_equals_prefix(current_token)
+    if body_equals_prefix is not None:
+        value, extra = _reassemble_split_quoted_value(
+            current_token[len(body_equals_prefix):], following_tokens
+        )
+        return False, value, token_index + 1 + extra
+    body_file_equals_prefix = match_body_file_equals_prefix(current_token)
+    if body_file_equals_prefix is not None:
+        value, extra = _reassemble_split_quoted_value(
+            current_token[len(body_file_equals_prefix):], following_tokens
+        )
+        return True, value, token_index + 1 + extra
+    if current_token in all_body_flags and following_tokens:
+        value, extra = _reassemble_split_quoted_value(following_tokens[0], following_tokens[1:])
+        return False, value, token_index + 2 + extra
+    if current_token in (body_file_flag, body_file_short_flag) and following_tokens:
+        value, extra = _reassemble_split_quoted_value(following_tokens[0], following_tokens[1:])
+        return True, value, token_index + 2 + extra
+    return None
+
+
+def _collect_body_flag_values(
+    all_command_tokens: list[str],
+) -> tuple[list[str], list[str]]:
+    """Return inline body strings and body-file paths from the command tokens.
+
+    Args:
+        all_command_tokens: The shlex-split tokens of the logical command line.
+
+    Returns:
+        A ``(all_inline_bodies, all_body_file_paths)`` pair, each value stripped
+        of its surrounding quotes and rejoined across split-quote tokens.
+    """
+    all_inline_bodies: list[str] = []
+    all_body_file_paths: list[str] = []
+    token_index = 0
+    while token_index < len(all_command_tokens):
+        extraction = _extract_flag_value_at(all_command_tokens, token_index)
+        if extraction is None:
+            token_index += 1
+            continue
+        is_body_file, value, next_index = extraction
+        if is_body_file:
+            all_body_file_paths.append(value)
+        else:
+            all_inline_bodies.append(value)
+        token_index = next_index
+    return all_inline_bodies, all_body_file_paths
+
+
+def _read_body_file(body_file_path: str) -> str | None:
+    """Return the contents of a body-file path, or None when it cannot be read.
+
+    Args:
+        body_file_path: The path given to ``--body-file``/``-F``.
+
+    Returns:
+        The file text, or None for an unresolvable shell value (such as ``-`` for
+        stdin or a ``$VAR`` path) or an unreadable file.
+    """
+    if is_unresolvable_shell_value(body_file_path):
+        return None
+    try:
+        return Path(body_file_path).read_text(encoding=BODY_FILE_ENCODING)
+    except OSError:
+        return None
+
+
+def extract_gh_post_body_texts(command: str) -> list[str]:
+    """Return every post body text an affected ``gh`` command would send.
+
+    Non-post ``gh`` commands and unparseable command lines yield an empty list.
+    Body-file contents are read from disk so the embedded text is scanned rather
+    than the file path.
+
+    Args:
+        command: The raw Bash tool command string.
+
+    Returns:
+        Inline ``--body`` strings plus the contents of each readable body-file.
+    """
+    logical_line = get_logical_first_line(command)
+    if not logical_line:
+        return []
+    try:
+        all_command_tokens = shlex.split(logical_line, posix=False)
+    except ValueError:
+        return []
+    if not _tokens_name_gh_post_command(all_command_tokens):
+        return []
+    all_inline_bodies, all_body_file_paths = _collect_body_flag_values(
+        all_command_tokens
+    )
+    all_body_texts = list(all_inline_bodies)
+    for each_path in all_body_file_paths:
+        file_text = _read_body_file(each_path)
+        if file_text is not None:
+            all_body_texts.append(file_text)
+    return all_body_texts
+
+
+def extract_mcp_body_texts(all_tool_input: dict[str, object]) -> list[str]:
+    """Return the body and comment strings from a GitHub MCP post tool input.
+
+    Args:
+        all_tool_input: The MCP tool's input mapping.
+
+    Returns:
+        The non-empty string values of the ``body`` and ``comment`` parameters.
+    """
+    all_body_texts: list[str] = []
+    for each_param_name in ALL_MCP_BODY_PARAM_NAMES:
+        param_value = all_tool_input.get(each_param_name)
+        if isinstance(param_value, str) and param_value:
+            all_body_texts.append(param_value)
+    return all_body_texts
+
+
+def _collect_body_texts(tool_name: str, all_tool_input: dict[str, object]) -> list[str]:
+    if tool_name == BASH_TOOL_NAME:
+        command = all_tool_input.get("command", "")
+        if not isinstance(command, str) or not command:
+            return []
+        return extract_gh_post_body_texts(command)
+    if tool_name.startswith(MCP_GITHUB_TOOL_PREFIX):
+        return extract_mcp_body_texts(all_tool_input)
+    return []
+
+
+def _first_volatile_marker(all_body_texts: list[str]) -> str | None:
+    for each_text in all_body_texts:
+        matched_marker = scan_text_for_volatile_marker(each_text)
+        if matched_marker is not None:
+            return matched_marker
+    return None
+
+
+def _emit_block(tool_name: str, matched_marker: str) -> None:
+    deny_payload = {
+        "hookSpecificOutput": {
+            "hookEventName": "PreToolUse",
+            "permissionDecision": "deny",
+            "permissionDecisionReason": CORRECTIVE_MESSAGE,
+        }
+    }
+    log_hook_block(
+        calling_hook_name="volatile_path_in_post_blocker.py",
+        hook_event="PreToolUse",
+        block_reason=CORRECTIVE_MESSAGE,
+        tool_name=tool_name,
+        offending_input_preview=matched_marker,
+    )
+    print(json.dumps(deny_payload))
+    sys.stdout.flush()
+
+
+def main() -> None:
+    """Read the PreToolUse payload and block a post that names a volatile path."""
+    try:
+        hook_input = json.load(sys.stdin)
+    except json.JSONDecodeError:
+        sys.exit(0)
+
+    tool_name = hook_input.get("tool_name", "")
+    tool_input = hook_input.get("tool_input", {})
+    if not isinstance(tool_name, str) or not isinstance(tool_input, dict):
+        sys.exit(0)
+
+    all_body_texts = _collect_body_texts(tool_name, tool_input)
+    matched_marker = _first_volatile_marker(all_body_texts)
+    if matched_marker is None:
+        sys.exit(0)
+
+    _emit_block(tool_name, matched_marker)
+    sys.exit(0)
+
+
+if __name__ == "__main__":
+    main()

package/hooks/hooks.json

@@ -55,6 +55,11 @@
             "command": "python3 ${CLAUDE_PLUGIN_ROOT}/hooks/blocking/gh_body_arg_blocker.py",
             "timeout": 10
           },
+          {
+            "type": "command",
+            "command": "python3 ${CLAUDE_PLUGIN_ROOT}/hooks/blocking/volatile_path_in_post_blocker.py",
+            "timeout": 10
+          },
           {
             "type": "command",
             "command": "python3 ${CLAUDE_PLUGIN_ROOT}/hooks/blocking/conventional_pr_title_gate.py",
@@ -142,6 +147,16 @@
           }
         ]
       },
+      {
+        "matcher": "mcp__plugin_github_github__.*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "python3 ${CLAUDE_PLUGIN_ROOT}/hooks/blocking/volatile_path_in_post_blocker.py",
+            "timeout": 10
+          }
+        ]
+      },
       {
         "matcher": "Agent",
         "hooks": [
@@ -186,6 +201,16 @@
             "timeout": 10
           }
         ]
+      },
+      {
+        "matcher": "EnterWorktree",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "python3 ${CLAUDE_PLUGIN_ROOT}/hooks/lifecycle/enter_worktree_origin_prefetch.py",
+            "timeout": 25
+          }
+        ]
       }
     ],
     "SessionStart": [

package/hooks/hooks_constants/CLAUDE.md

@@ -13,6 +13,7 @@ Shared constant modules imported by hooks throughout the `hooks/` tree. Each fil
 | `bot_mention_comment_blocker_constants.py` | Patterns for detecting bot @-mentions in PR comments |
 | `claude_md_orphan_file_blocker_constants.py` | Table patterns, file extensions, scan budget, and block-message text for the CLAUDE.md orphan-file blocker |
 | `code_rules_enforcer_constants.py` | File-extension sets, test-path patterns, advisory line thresholds, boolean-name prefixes |
+| `enter_worktree_prefetch_constants.py` | Tool name, origin-remote ref names, and git-command timeouts for the EnterWorktree origin-prefetch hook |
 | `env_var_table_code_drift_constants.py` | Table patterns, env-var-name and code-file recognizers, scan budget, and block-message text for the env-var-table code-drift blocker |
 | `code_rules_path_utils_constants.py` | Path-matching helpers used by the code-rules check modules |
 | `code_verifier_spawn_preflight_gate_constants.py` | Subagent type, merge-tree command flags, timeouts, and deny-message text for the code-verifier spawn pre-flight gate |
@@ -65,6 +66,7 @@ Shared constant modules imported by hooks throughout the `hooks/` tree. Each fil
 | `task_list_loop_starter_constants.py` | The one-line task-list instruction and the full session-start directive text for the task-list loop starter hook |
 | `text_stripping.py` | `strip_code_and_quotes()` — shared helper that removes fenced code blocks, inline code, and blockquotes from prose, imported by the Stop-hook prose blockers |
 | `unused_module_import_constants.py` | Patterns for detecting unused module-level imports |
+| `volatile_path_in_post_blocker_constants.py` | Volatile path markers, affected `gh` post subcommands, MCP body param names, and the corrective message for the volatile-path post blocker |
 | `windows_rmtree_blocker_constants.py` | The unsafe `shutil.rmtree` pattern and the safe replacement pattern |
 | `workflow_substitution_slot_blocker_constants.py` | Per-iteration token patterns for the workflow-slot blocker |
 

package/hooks/hooks_constants/enter_worktree_prefetch_constants.py

@@ -0,0 +1,18 @@
+"""Configuration constants for the ``enter_worktree_origin_prefetch`` hook.
+
+The hook keeps a freshly created worktree from starting on a stale cached
+``refs/remotes/origin/<default-branch>`` value: it fetches that ref right
+before ``EnterWorktree`` resolves its base.
+"""
+
+from __future__ import annotations
+
+ENTER_WORKTREE_TOOL_NAME: str = "EnterWorktree"
+ENTER_WORKTREE_PATH_INPUT_KEY: str = "path"
+
+ORIGIN_REMOTE_NAME: str = "origin"
+ORIGIN_HEAD_SYMBOLIC_REF: str = "refs/remotes/origin/HEAD"
+ORIGIN_REMOTE_REF_PREFIX: str = "refs/remotes/origin/"
+
+GIT_SYMBOLIC_REF_TIMEOUT_SECONDS: int = 5
+GIT_FETCH_TIMEOUT_SECONDS: int = 15

package/hooks/hooks_constants/volatile_path_in_post_blocker_constants.py

@@ -0,0 +1,48 @@
+"""Configuration constants for the volatile_path_in_post_blocker PreToolUse hook."""
+
+BASH_TOOL_NAME: str = "Bash"
+
+MCP_GITHUB_TOOL_PREFIX: str = "mcp__plugin_github_github__"
+
+ALL_MCP_BODY_PARAM_NAMES: tuple[str, ...] = ("body", "comment")
+
+GH_COMMAND_NAME: str = "gh"
+
+MINIMUM_POST_SUBCOMMAND_TOKEN_COUNT: int = 2
+
+TOKEN_JOIN_SEPARATOR: str = " "
+
+BODY_FILE_ENCODING: str = "utf-8"
+
+ALL_GH_POST_SUBCOMMANDS: dict[str, frozenset[str]] = {
+    "pr": frozenset({"create", "comment", "edit", "review"}),
+    "issue": frozenset({"create", "comment", "edit"}),
+}
+
+ALL_VOLATILE_PATH_MARKERS: tuple[str, ...] = (
+    ".claude-editor/jobs/",
+    ".claude/worktrees/",
+    "appdata/local/temp",
+    "/tmp/",
+    "%temp%",
+    "$env:temp",
+    "$claude_job_dir",
+)
+
+GH_ARTIFACT_UPLOAD_INVOCATION: str = (
+    "python3 ~/.claude/scripts/gh_artifact_upload.py <file-path> <owner/repo>"
+)
+
+CORRECTIVE_MESSAGE: str = (
+    "BLOCKED [durable-post-artifacts]: this post body references a volatile path "
+    "(a job scratch dir, worktree, or system temp location). The post is durable "
+    "and outlives that scratch, so the reference breaks the moment the directory "
+    "is cleaned.\n\n"
+    "Fix it before posting:\n"
+    "  1. Text data (logs, tables, diffs): paste the actual content inline in the "
+    "post instead of linking a scratch file path.\n"
+    "  2. Binary artifacts (images, archives): upload the file to the repo's "
+    "durable 'artifacts' release and link the permanent asset URL it prints:\n"
+    f"       {GH_ARTIFACT_UPLOAD_INVOCATION}\n\n"
+    "See ~/.claude/rules/durable-post-artifacts.md for the full contract."
+)

package/hooks/lifecycle/CLAUDE.md

@@ -7,12 +7,14 @@ Hooks that run at session or config-change boundaries rather than on individual
 | File | Event | What it does |
 |---|---|---|
 | `config_change_guard.py` | PostToolUse (Write/Edit on `settings.json`) | Counts hooks in the edited `settings.json` and logs any change to `~/.claude/cache/config-change-audit.log`; alerts when the hook count drops below the last known value |
+| `enter_worktree_origin_prefetch.py` | PreToolUse (EnterWorktree) | Fetches origin's default branch before a worktree creation call, keeping the `refs/remotes/origin/<default-branch>` ref that `fresh` mode reads current; never blocks on fetch failure |
 | `pr_converge_bugteam_skill_tracker.py` | PreToolUse (Skill) | Tracks which bugteam skill runs have completed within a pr-converge loop, so the enforcer can verify parallel execution |
 | `session_end_cleanup.py` | SessionEnd | Purges stale cache entries from `~/.claude/cache/` (entries older than the configured threshold) and old backup files |
 | `test_config_change_guard.py` | — | Tests for `config_change_guard.py` |
+| `test_enter_worktree_origin_prefetch.py` | — | Tests for `enter_worktree_origin_prefetch.py` |
 | `test_pr_converge_bugteam_skill_tracker.py` | — | Tests for `pr_converge_bugteam_skill_tracker.py` |
 
 ## Conventions
 
-- Constants for these hooks (stale-age threshold, cache directory, known-hook-count file) live in `hooks_constants/session_env_cleanup_constants.py` and `hooks_constants/pr_converge_bugteam_enforcer_constants.py`.
+- Constants for these hooks (stale-age threshold, cache directory, known-hook-count file, EnterWorktree prefetch tuning) live in `hooks_constants/session_env_cleanup_constants.py`, `hooks_constants/pr_converge_bugteam_enforcer_constants.py`, and `hooks_constants/enter_worktree_prefetch_constants.py`.
 - Tests run with `python -m pytest lifecycle/test_<name>.py`.

package/hooks/lifecycle/enter_worktree_origin_prefetch.py

@@ -0,0 +1,146 @@
+#!/usr/bin/env python3
+"""PreToolUse hook: fetch origin's default branch before EnterWorktree creates one.
+
+``EnterWorktree`` in its default ``fresh`` mode bases a new worktree on the
+locally cached ``refs/remotes/origin/<default-branch>`` ref and only runs
+``git fetch`` when that ref is missing entirely -- so a worktree created
+without a recent fetch silently starts behind the remote. This hook fetches
+that ref immediately before the tool resolves its base, so the ref it reads
+is current.
+
+::
+
+    EnterWorktree({})                              # tool_input has no "path"
+             |
+             v
+    this hook: git fetch origin <default-branch>   # best-effort, never blocks
+             |
+             v
+    EnterWorktree resolves refs/remotes/origin/<default-branch>  # now fresh
+
+The hook is a no-op when ``tool_input`` carries a ``path`` (switching into an
+already-existing worktree needs no fresh base) and always exits 0 -- a failed
+or slow fetch never blocks worktree creation.
+"""
+
+from __future__ import annotations
+
+import json
+import subprocess
+import sys
+from pathlib import Path
+
+_hooks_dir = str(Path(__file__).resolve().parent.parent)
+if _hooks_dir not in sys.path:
+    sys.path.insert(0, _hooks_dir)
+
+from hooks_constants.enter_worktree_prefetch_constants import (  # noqa: E402
+    ENTER_WORKTREE_PATH_INPUT_KEY,
+    ENTER_WORKTREE_TOOL_NAME,
+    GIT_FETCH_TIMEOUT_SECONDS,
+    GIT_SYMBOLIC_REF_TIMEOUT_SECONDS,
+    ORIGIN_HEAD_SYMBOLIC_REF,
+    ORIGIN_REMOTE_NAME,
+    ORIGIN_REMOTE_REF_PREFIX,
+)
+
+
+def is_enter_worktree_creation(payload_by_field: dict[str, object]) -> bool:
+    """Return True when this hook invocation is an EnterWorktree creation call.
+
+    Args:
+        payload_by_field: The full PreToolUse hook payload (already JSON-parsed),
+            keyed by top-level field name.
+
+    Returns:
+        True when ``tool_name == "EnterWorktree"`` and ``tool_input`` carries
+        no ``path`` key. A ``path`` value means the call switches into an
+        already-existing worktree rather than creating one, so it is False
+        for that case and for every other tool.
+    """
+    if payload_by_field.get("tool_name", "") != ENTER_WORKTREE_TOOL_NAME:
+        return False
+    tool_input = payload_by_field.get("tool_input", {})
+    if not isinstance(tool_input, dict):
+        return True
+    return not tool_input.get(ENTER_WORKTREE_PATH_INPUT_KEY)
+
+
+def resolve_origin_default_branch(repo_directory: str) -> str | None:
+    """Return the branch name origin's HEAD points at, or None if unresolved.
+
+    Args:
+        repo_directory: Working directory to run ``git`` in.
+
+    Returns:
+        The branch name (for example ``"main"``) parsed from
+        ``refs/remotes/origin/HEAD``, or None when the symbolic ref is
+        unset, git is unavailable, or the command times out.
+    """
+    try:
+        completed_process = subprocess.run(
+            ["git", "symbolic-ref", ORIGIN_HEAD_SYMBOLIC_REF],
+            capture_output=True,
+            text=True,
+            timeout=GIT_SYMBOLIC_REF_TIMEOUT_SECONDS,
+            cwd=repo_directory,
+            check=False,
+        )
+    except (subprocess.TimeoutExpired, FileNotFoundError, OSError):
+        return None
+    if completed_process.returncode != 0:
+        return None
+    resolved_ref = completed_process.stdout.strip()
+    if not resolved_ref.startswith(ORIGIN_REMOTE_REF_PREFIX):
+        return None
+    return resolved_ref[len(ORIGIN_REMOTE_REF_PREFIX):]
+
+
+def fetch_origin_branch(repo_directory: str, branch_name: str) -> None:
+    """Best-effort ``git fetch origin <branch_name>``; never raises.
+
+    Args:
+        repo_directory: Working directory to run ``git`` in.
+        branch_name: Branch to fetch from the ``origin`` remote.
+    """
+    try:
+        subprocess.run(
+            ["git", "fetch", ORIGIN_REMOTE_NAME, branch_name],
+            capture_output=True,
+            text=True,
+            timeout=GIT_FETCH_TIMEOUT_SECONDS,
+            cwd=repo_directory,
+            check=False,
+        )
+    except (subprocess.TimeoutExpired, FileNotFoundError, OSError):
+        return
+
+
+def main() -> None:
+    """Entry point for the PreToolUse:EnterWorktree hook.
+
+    Reads the PreToolUse payload from stdin, and when it is an EnterWorktree
+    creation call, fetches origin's default branch in the session's ``cwd``
+    before returning. Always exits 0: a fetch failure self-heals on the next
+    fetch rather than blocking worktree creation.
+    """
+    try:
+        hook_payload = json.load(sys.stdin)
+    except json.JSONDecodeError:
+        sys.exit(0)
+    if not isinstance(hook_payload, dict):
+        sys.exit(0)
+    if not is_enter_worktree_creation(hook_payload):
+        sys.exit(0)
+    repo_directory = hook_payload.get("cwd")
+    if not isinstance(repo_directory, str) or not repo_directory:
+        sys.exit(0)
+    default_branch = resolve_origin_default_branch(repo_directory)
+    if default_branch is None:
+        sys.exit(0)
+    fetch_origin_branch(repo_directory, default_branch)
+    sys.exit(0)
+
+
+if __name__ == "__main__":
+    main()