claude-dev-env 2.15.0 → 2.16.0

package/hooks/blocking/test_code_rules_enforcer_magic_slice_bounds.py

@@ -27,7 +27,7 @@ def _load_enforcer_module() -> ModuleType:
 code_rules_enforcer = _load_enforcer_module()
 
 
-PRODUCTION_FILE_PATH = "packages/claude-dev-env/skills/example/workflow/example_render.py"
+PRODUCTION_FILE_PATH = "packages/claude-dev-env/.agents/skills/example/workflow/example_render.py"
 
 
 def test_check_magic_values_should_flag_short_sha_slice_bound() -> None:

package/hooks/blocking/test_code_rules_enforcer_split_annotations_length.py

@@ -37,7 +37,7 @@ def test_should_treat_backslash_repo_relative_hook_path_as_hook_infrastructure()
 
 
 def test_should_not_treat_unrelated_repo_relative_path_as_hook_infrastructure() -> None:
-    relative_source_path = "packages/claude-dev-env/skills/bugteam/scripts/runner.py"
+    relative_source_path = "packages/claude-dev-env/.agents/skills/bugteam/scripts/runner.py"
     assert code_rules_enforcer.is_hook_infrastructure(relative_source_path) is False
 
 

package/hooks/blocking/test_code_rules_js_conventions.py

@@ -12,7 +12,7 @@ from code_rules_js_conventions import (  # noqa: E402
     check_js_boolean_naming,
 )
 
-CONVERGE_PATH = "packages/claude-dev-env/skills/autoconverge/workflow/converge.mjs"
+CONVERGE_PATH = "packages/claude-dev-env/.agents/skills/autoconverge/workflow/converge.mjs"
 
 
 def test_flags_unprefixed_boolean_let_declaration() -> None:

package/hooks/blocking/test_code_rules_js_resume_task_enumeration.py

@@ -18,7 +18,7 @@ import sys
 
 _PACKAGE_ROOT = pathlib.Path(__file__).resolve().parents[2]
 _SHIPPED_CONVERGE_MJS = (
-    _PACKAGE_ROOT / "skills" / "autoconverge" / "workflow" / "converge.mjs"
+    _PACKAGE_ROOT / ".agents" / "skills" / "autoconverge" / "workflow" / "converge.mjs"
 )
 
 _HOOK_DIRECTORY = pathlib.Path(__file__).parent

package/hooks/blocking/test_code_rules_js_returns_object_schemaless.py

@@ -35,7 +35,7 @@ check_js_returns_object_schemaless_branch = (
 _MJS_PATH = "skills/autoconverge/workflow/converge.mjs"
 
 _SHIPPED_CONVERGE_MJS = (
-    _HOOK_DIRECTORY.parents[1] / "skills" / "autoconverge" / "workflow" / "converge.mjs"
+    _HOOK_DIRECTORY.parents[1] / ".agents" / "skills" / "autoconverge" / "workflow" / "converge.mjs"
 )
 
 

package/hooks/blocking/test_code_rules_js_sibling_return_object_key_drift.py

@@ -34,7 +34,7 @@ check_js_sibling_return_object_key_drift = (
 _MJS_PATH = "skills/autoconverge/workflow/converge_multi.mjs"
 
 _SHIPPED_CONVERGE_MJS = (
-    _HOOK_DIRECTORY.parents[1] / "skills" / "autoconverge" / "workflow" / "converge.mjs"
+    _HOOK_DIRECTORY.parents[1] / ".agents" / "skills" / "autoconverge" / "workflow" / "converge.mjs"
 )
 
 _SHIPPED_INSTALL_MYPY_INI_MJS = (

package/hooks/blocking/test_duplicate_rmtree_helper_blocker.py

@@ -144,7 +144,7 @@ def test_path_exempts_existing_session_env_cleanup_definition_site() -> None:
 
 def test_path_exempts_existing_teardown_worktrees_definition_site() -> None:
     assert path_is_exempt(
-        "packages/claude-dev-env/skills/_shared/pr-loop/scripts/teardown_worktrees.py"
+        "packages/claude-dev-env/.agents/skills/_shared/pr-loop/scripts/teardown_worktrees.py"
     )
 
 

package/hooks/blocking/test_fable_spawn_gate.py

@@ -74,7 +74,7 @@ _ADVISOR_WARM_UP_TEXT = (_ADVISOR_REFERENCE_DIR / "warm-up.md").read_text(
 )
 _ALL_CONSUMING_SKILL_NAMES = ("team-advisor", "orchestrator", "orchestrator-refresh")
 _ALL_CONSUMING_SKILL_PATHS = tuple(
-    _PACKAGE_ROOT / "skills" / each_skill_name / "SKILL.md"
+    _PACKAGE_ROOT / ".agents" / "skills" / each_skill_name / "SKILL.md"
     for each_skill_name in _ALL_CONSUMING_SKILL_NAMES
 )
 _skill_pin_ids = _ALL_CONSUMING_SKILL_NAMES

package/hooks/blocking/test_orchestrator_refresh_reschedule_gate.py

@@ -16,7 +16,7 @@ HOOKS_DIRECTORY = BLOCKING_DIRECTORY.parent
 if str(HOOKS_DIRECTORY) not in sys.path:
     sys.path.insert(0, str(HOOKS_DIRECTORY))
 
-SKILL_SCRIPTS = HOOKS_DIRECTORY.parent / "skills" / "orchestrator" / "scripts"
+SKILL_SCRIPTS = HOOKS_DIRECTORY.parent / ".agents" / "skills" / "orchestrator" / "scripts"
 if str(SKILL_SCRIPTS) not in sys.path:
     sys.path.insert(0, str(SKILL_SCRIPTS))
 

package/hooks/hooks_constants/orchestrator_refresh_reschedule_gate_constants.py

@@ -34,11 +34,20 @@ DENY_REASON_TEMPLATE = (
 CALLING_HOOK_NAME = "orchestrator_refresh_reschedule_gate.py"
 HOOK_EVENT_NAME = "PreToolUse"
 
+ALL_PACKAGE_AGENTS_SKILL_SCRIPTS_RELATIVE_PARTS: tuple[str, ...] = (
+    ".agents",
+    "skills",
+    "orchestrator",
+    "scripts",
+)
+"""Package-source path of orchestrator status_gate.py under the agents home."""
+
 ALL_SKILL_SCRIPTS_RELATIVE_PARTS: tuple[str, ...] = (
     "skills",
     "orchestrator",
     "scripts",
 )
+"""Package-root path of orchestrator status_gate.py for a dependency layout."""
 PLUGIN_ROOT_ENV_VAR = "CLAUDE_PLUGIN_ROOT"
 ALL_HOME_SKILLS_RELATIVE_PARTS: tuple[str, ...] = (
     ".claude",

package/installable-surfaces.manifest.json

@@ -4,9 +4,8 @@
     "rules",
     "docs",
     "commands",
-    "agents",
+    ".agents",
     "output-styles",
-    "skills",
     "hooks",
     "system-prompts",
     "scripts",
@@ -15,7 +14,7 @@
   ],
   "root_files": [
     "AGENTS.md",
-    "CLAUDE.md",
+    ".claude/CLAUDE.md",
     "codex-capability-map.json",
     "installable-surfaces.manifest.json"
   ]

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "claude-dev-env",
-    "version": "2.15.0",
+    "version": "2.16.0",
     "description": "Claude Code development standards — rules, hooks, agents, commands, and skills",
     "type": "module",
     "bin": {
@@ -8,16 +8,15 @@
         "codex-compat": "bin/codex-compat.mjs"
     },
     "scripts": {
-        "test": "node --test \"bin/*.test.mjs\" \"skills/**/*.test.mjs\" \"scripts/profile-isolation-launchers/**/*.test.mjs\" \"tests/fresh-session/**/*.test.mjs\""
+        "test": "node --test \"bin/*.test.mjs\" \".agents/skills/**/*.test.mjs\" \"tests/fresh-session/**/*.test.mjs\""
     },
     "files": [
         "bin/",
         "rules/",
         "docs/",
         "commands/",
-        "agents/",
+        ".agents/",
         "output-styles/",
-        "skills/",
         "hooks/",
         "system-prompts/",
         "scripts/",
@@ -28,7 +27,7 @@
         "audit-rubrics/",
         "codex-rules/",
         "AGENTS.md",
-        "CLAUDE.md",
+        ".claude/CLAUDE.md",
         "!**/__pycache__/**",
         "!**/*.py[cod]",
         "!**/.pytest_cache/**",

package/scripts/AGENTS.md

@@ -37,7 +37,6 @@ Utility scripts installed into `~/.claude/scripts/` by `bin/install.mjs`. Each s
 |---|---|
 | `ci/` | CI-only adapters; `windows-installer-lifecycle.ps1` runs the Node installer 16-check driver under isolated HOME/USERPROFILE/GIT_CONFIG_GLOBAL and writes bounded evidence |
 | `dev_env_scripts_constants/` | Named constants (`timing.py`, `grok_worker_constants.py`, …) for scripts in this directory, including worker-advisor placeholder launcher/model/effort, four verdict signals, correction cap, and advisor timeout |
-| `profile-isolation-launchers/` | Profile-launcher contract plus MCP activation, Windows shortcut source semantics, and version preflight: profiles manifest, shared-path allowlist, profile resolver, `CLAUDE_CONFIG_DIR` authority, lean/full MCP bundle materialization into profile `mcp.json`, pure CLI/Desktop version-compatibility classifier consumed by launcher preflight, read-only shortcut inventory and preview reconcile under `windows/`. Live launcher execution, provenance pin, live shortcut mutation, and L1 deploy stay residual |
 | `sync_to_cursor/` | Package that builds Cursor `.mdc` files from Claude rules and docs |
 | `tests/` | pytest suite for the Python scripts and Pester (`*.Tests.ps1`) suite for the PowerShell scripts in this directory |
 
@@ -49,12 +48,6 @@ Python scripts (pytest):
 python -m pytest packages/claude-dev-env/scripts/tests/
 ```
 
-Profile-isolation launcher contract (node:test):
-
-```bash
-node --test packages/claude-dev-env/scripts/profile-isolation-launchers/**/*.test.mjs
-```
-
 PowerShell scripts (Pester 5+, `*.Tests.ps1`):
 
 ```powershell

package/scripts/active_capability_references.py

@@ -28,6 +28,8 @@ from dev_env_scripts_constants.active_capability_constants import (
     NEWLINE_JOIN_SEPARATOR,
     PACKAGE_AGENTS_DIRECTORY,
     PACKAGE_COMMANDS_DIRECTORY,
+    PACKAGE_ROOT_AGENTS_DIRECTORY,
+    PACKAGE_ROOT_SKILLS_DIRECTORY,
     PACKAGE_SKILLS_DIRECTORY,
     SKILL_MANIFEST_FILENAME,
     SLASH_CAPABILITY_PATTERN,
@@ -58,6 +60,18 @@ class UnresolvedCapabilityReference:
     reason: str
 
 
+def _resolve_package_tree(
+    from_package_root: Path,
+    canonical_relative: str,
+    package_root_name: str,
+) -> Path:
+    """Return the canonical tree when it exists, else the package-root name."""
+    canonical_directory = from_package_root / canonical_relative
+    if canonical_directory.is_dir():
+        return canonical_directory
+    return from_package_root / package_root_name
+
+
 def build_capability_inventory(from_package_root: Path) -> CapabilityInventory:
     """Build inventories from committed skill/agent/command files.
 
@@ -67,8 +81,16 @@ def build_capability_inventory(from_package_root: Path) -> CapabilityInventory:
     Returns:
         Inventory of basenames present on disk.
     """
-    skills_root = from_package_root / PACKAGE_SKILLS_DIRECTORY
-    agents_root = from_package_root / PACKAGE_AGENTS_DIRECTORY
+    skills_root = _resolve_package_tree(
+        from_package_root,
+        PACKAGE_SKILLS_DIRECTORY,
+        PACKAGE_ROOT_SKILLS_DIRECTORY,
+    )
+    agents_root = _resolve_package_tree(
+        from_package_root,
+        PACKAGE_AGENTS_DIRECTORY,
+        PACKAGE_ROOT_AGENTS_DIRECTORY,
+    )
     commands_root = from_package_root / PACKAGE_COMMANDS_DIRECTORY
     all_skills: set[str] = set()
     if skills_root.is_dir():
@@ -203,12 +225,20 @@ def unresolved_active_capabilities(
 
 def _default_markdown_paths(from_package_root: Path) -> list[str]:
     all_paths: list[str] = []
-    for each_directory_name in (
-        PACKAGE_SKILLS_DIRECTORY,
-        PACKAGE_AGENTS_DIRECTORY,
-        PACKAGE_COMMANDS_DIRECTORY,
-    ):
-        directory_path = from_package_root / each_directory_name
+    directory_paths = [
+        _resolve_package_tree(
+            from_package_root,
+            PACKAGE_SKILLS_DIRECTORY,
+            PACKAGE_ROOT_SKILLS_DIRECTORY,
+        ),
+        _resolve_package_tree(
+            from_package_root,
+            PACKAGE_AGENTS_DIRECTORY,
+            PACKAGE_ROOT_AGENTS_DIRECTORY,
+        ),
+        from_package_root / PACKAGE_COMMANDS_DIRECTORY,
+    ]
+    for directory_path in directory_paths:
         if not directory_path.is_dir():
             continue
         for each_markdown_file in directory_path.rglob("*.md"):

package/scripts/claude_chain_runner.py

@@ -48,7 +48,9 @@ import os
 import subprocess
 import sys
 import tempfile
-from collections.abc import Callable, Sequence
+import threading
+from collections.abc import Callable, Iterator, Sequence
+from contextlib import contextmanager
 from dataclasses import dataclass, field
 from pathlib import Path
 from types import ModuleType
@@ -327,6 +329,35 @@ class WeeklyUsageAccountReport(Protocol):
 
 
 chain_subprocess_runner = _run_captured_subprocess
+_shared_chain_subprocess_lock = threading.Lock()
+
+
+def chain_subprocess_runner_lock() -> threading.Lock:
+    """Return the lock for adapters that temporarily configure the runner."""
+    return _shared_chain_subprocess_lock
+
+
+@contextmanager
+def override_chain_subprocess_runner(
+    replacement_runner: Callable[..., subprocess.CompletedProcess[str]],
+) -> Iterator[Callable[..., subprocess.CompletedProcess[str]]]:
+    """Temporarily replace the chain subprocess seam under its shared lock.
+
+    Args:
+        replacement_runner: Callable used for subprocess invocations during the
+            context.
+
+    Yields:
+        The runner that was active before the replacement.
+    """
+    global chain_subprocess_runner
+    with chain_subprocess_runner_lock():
+        previous_runner = chain_subprocess_runner
+        chain_subprocess_runner = replacement_runner
+        try:
+            yield previous_runner
+        finally:
+            chain_subprocess_runner = previous_runner
 
 
 def _load_chain_usage_module() -> ModuleType:
@@ -1138,6 +1169,22 @@ def _persist_served_affinity(
         return
 
 
+def _run_cli_chain(
+    all_claude_arguments: list[str],
+    *,
+    timeout_seconds: int,
+    stdin_text: str | None,
+    routing_mode: str,
+) -> ChainInvocationOutcome:
+    """Run the CLI-selected chain arguments through the public runner."""
+    return run_claude(
+        all_claude_arguments,
+        timeout_seconds=timeout_seconds,
+        stdin_text=stdin_text,
+        routing_mode=routing_mode,
+    )
+
+
 def _build_argument_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(
         description="Run a claude invocation through the fallback chain."
@@ -1206,7 +1253,7 @@ def main(all_command_arguments: list[str]) -> int:
     all_claude_arguments = _strip_leading_separator(parsed_arguments.passthrough)
     maybe_stdin_text = _read_piped_stdin_text()
     try:
-        chain_outcome = run_claude(
+        chain_outcome = _run_cli_chain(
             all_claude_arguments,
             timeout_seconds=parsed_arguments.timeout_seconds,
             stdin_text=maybe_stdin_text,

package/scripts/claude_chain_usage.py

@@ -41,6 +41,7 @@ from dev_env_scripts_constants.claude_chain_usage_constants import (
     RESOLVE_USAGE_WINDOW_FILENAME,
     RESOLVE_USAGE_WINDOW_MISSING_ERROR_TEMPLATE,
     RESOLVE_USAGE_WINDOW_MODULE_NAME,
+    USAGE_PAUSE_AGENTS_HOME_DIRECTORY_NAME,
     USAGE_PAUSE_SCRIPTS_DIRECTORY_NAME,
     USAGE_PAUSE_SKILL_DIRECTORY_NAME,
     USAGE_PAUSE_SKILL_NAME,
@@ -83,6 +84,7 @@ def _usage_pause_scripts_directory() -> Path:
     package_root = Path(__file__).resolve().parent.parent
     return (
         package_root
+        / USAGE_PAUSE_AGENTS_HOME_DIRECTORY_NAME
         / USAGE_PAUSE_SKILL_DIRECTORY_NAME
         / USAGE_PAUSE_SKILL_NAME
         / USAGE_PAUSE_SCRIPTS_DIRECTORY_NAME

package/scripts/codex_compat_watcher.py

@@ -30,7 +30,7 @@ class _WatcherConfiguration:
     copy_link_kind = "copy"
     symlink_link_kind = "symlink"
     junction_link_kind = "junction"
-    all_configured_root_names = ("agents", "commands", "hooks", "rules", "skills")
+    all_configured_root_names = (".agents", "commands", "hooks", "rules")
     all_unsafe_event_kinds = {"overflow", "ambiguous", "inaccessible", "error", "unknown"}
     reparse_point_attribute = getattr(stat, "FILE_ATTRIBUTE_REPARSE_POINT", 0x400)
 

package/scripts/dev_env_scripts_constants/active_capability_constants.py

@@ -6,9 +6,12 @@ timing.py and the other per-script constant modules.
 
 from __future__ import annotations
 
-PACKAGE_SKILLS_DIRECTORY: str = "skills"
-PACKAGE_AGENTS_DIRECTORY: str = "agents"
+PACKAGE_AGENTS_HOME_DIRECTORY: str = ".agents"
+PACKAGE_SKILLS_DIRECTORY: str = ".agents/skills"
+PACKAGE_AGENTS_DIRECTORY: str = ".agents/agents"
 PACKAGE_COMMANDS_DIRECTORY: str = "commands"
+PACKAGE_ROOT_SKILLS_DIRECTORY: str = "skills"
+PACKAGE_ROOT_AGENTS_DIRECTORY: str = "agents"
 SKILL_MANIFEST_FILENAME: str = "SKILL.md"
 
 # Slash-command and skill names that must never appear as active instructions.

package/scripts/dev_env_scripts_constants/claude_chain_usage_constants.py

@@ -9,8 +9,11 @@ from __future__ import annotations
 FULL_WEEKLY_PERCENT: float = 100.0
 """Percent scale ceiling for weekly utilization (remaining = this minus used)."""
 
+USAGE_PAUSE_AGENTS_HOME_DIRECTORY_NAME: str = ".agents"
+"""Package subdirectory that holds the canonical skill and agent source trees."""
+
 USAGE_PAUSE_SKILL_DIRECTORY_NAME: str = "skills"
-"""Package-root directory name that holds skill trees (sibling of ``scripts/``)."""
+"""Directory name under the agents home that holds skill trees."""
 
 USAGE_PAUSE_SKILL_NAME: str = "usage-pause"
 """Skill directory name under ``skills/`` that owns the OAuth usage probe."""

package/scripts/invoke_code_review.py

@@ -28,20 +28,30 @@ import argparse
 import json
 import subprocess
 import sys
-import threading
 from collections.abc import Callable, Sequence
 from dataclasses import dataclass
 from pathlib import Path
 
-if str(Path(__file__).resolve().parent) not in sys.path:
-    sys.path.insert(0, str(Path(__file__).resolve().parent))
+_scripts_directory_path = Path(__file__).resolve().parent
+_scripts_directory = str(_scripts_directory_path)
+sys.path[:] = [
+    each_existing_entry
+    for each_existing_entry in sys.path
+    if each_existing_entry != _scripts_directory
+]
+sys.path[:0] = [_scripts_directory]
 
 _advisor_scripts_path = str(
-    Path(__file__).resolve().parent.parent / "_shared" / "advisor" / "scripts"
+    _scripts_directory_path.parent / "_shared" / "advisor" / "scripts"
 )
-if _advisor_scripts_path not in sys.path:
-    sys.path.insert(0, _advisor_scripts_path)
+sys.path[:] = [
+    each_existing_entry
+    for each_existing_entry in sys.path
+    if each_existing_entry != _advisor_scripts_path
+]
+sys.path[:0] = [_advisor_scripts_path]
 
+from tier_model_ids import detect_host_profile  # noqa: E402
 from advisor_scripts_constants.model_tier_run_validator_constants import (  # noqa: E402
     HOST_PROFILE_CLAUDE,
 )
@@ -93,14 +103,6 @@ from dev_env_scripts_constants.grok_worker_constants import (  # noqa: E402
 from dev_env_scripts_constants.timing import (  # noqa: E402
     DEFAULT_CODE_REVIEW_TIMEOUT_SECONDS,
 )
-from tier_model_ids import detect_host_profile  # noqa: E402
-
-_CHAIN_RUNNER_LOCK = threading.Lock()
-
-
-def _chain_runner_lock() -> threading.Lock:
-    """Return the module lock that serializes chain-runner stdin/cwd swaps."""
-    return _CHAIN_RUNNER_LOCK
 
 
 @dataclass(frozen=True)
@@ -302,44 +304,39 @@ def _run_claude_with_empty_stdin(
     working_directory: Path,
 ) -> ChainInvocationOutcome:
     working_directory_path = str(working_directory)
-    with _CHAIN_RUNNER_LOCK:
-        previous_runner: TextCapturingSubprocessRunner = (
-            chain_runner.chain_subprocess_runner
-        )
 
-        def _runner_with_empty_stdin(
-            all_invocation_tokens: Sequence[str],
-            *all_positionals: object,
-            **all_keywords: object,
-        ) -> subprocess.CompletedProcess[str]:
-            del all_positionals
-            maybe_timeout = all_keywords.get("timeout")
-            timeout_for_run: float | None
-            if isinstance(maybe_timeout, (int, float)):
-                timeout_for_run = float(maybe_timeout)
-            else:
-                timeout_for_run = None
-            forwarded_text_codec = collect_forwarded_text_codec(all_keywords)
-            completed_process: subprocess.CompletedProcess[str] = previous_runner(
-                all_invocation_tokens,
-                capture_output=True,
-                text=True,
-                timeout=timeout_for_run,
-                check=False,
-                stdin=subprocess.DEVNULL,
-                cwd=working_directory_path,
-                **forwarded_text_codec,
-            )
-            return completed_process
-
-        empty_stdin_runner: TextCapturingSubprocessRunner = _runner_with_empty_stdin
-        setattr(chain_runner, "chain_subprocess_runner", empty_stdin_runner)
-        try:
-            return review_claude_runner(
-                all_claude_arguments, timeout_seconds=timeout_seconds
-            )
-        finally:
-            setattr(chain_runner, "chain_subprocess_runner", previous_runner)
+    def _runner_with_empty_stdin(
+        all_invocation_tokens: Sequence[str],
+        *all_positionals: object,
+        **all_keywords: object,
+    ) -> subprocess.CompletedProcess[str]:
+        del all_positionals
+        maybe_timeout = all_keywords.get("timeout")
+        timeout_for_run: float | None
+        if isinstance(maybe_timeout, (int, float)):
+            timeout_for_run = float(maybe_timeout)
+        else:
+            timeout_for_run = None
+        forwarded_text_codec = collect_forwarded_text_codec(all_keywords)
+        completed_process: subprocess.CompletedProcess[str] = previous_runner(
+            all_invocation_tokens,
+            capture_output=True,
+            text=True,
+            timeout=timeout_for_run,
+            check=False,
+            stdin=subprocess.DEVNULL,
+            cwd=working_directory_path,
+            **forwarded_text_codec,
+        )
+        return completed_process
+
+    empty_stdin_runner: TextCapturingSubprocessRunner = _runner_with_empty_stdin
+    with chain_runner.override_chain_subprocess_runner(
+        empty_stdin_runner
+    ) as previous_runner:
+        return review_claude_runner(
+            all_claude_arguments, timeout_seconds=timeout_seconds
+        )
 
 
 def _in_session_outcome() -> CodeReviewOutcome:

package/scripts/resolve_worker_spawn.py

@@ -26,21 +26,31 @@ import argparse
 import json
 import subprocess
 import sys
-import threading
 from collections.abc import Callable, Sequence
 from dataclasses import dataclass
 from pathlib import Path
 from typing import IO
 
-if str(Path(__file__).resolve().parent) not in sys.path:
-    sys.path.insert(0, str(Path(__file__).resolve().parent))
+_scripts_directory_path = Path(__file__).resolve().parent
+_scripts_directory = str(_scripts_directory_path)
+sys.path[:] = [
+    each_existing_entry
+    for each_existing_entry in sys.path
+    if each_existing_entry != _scripts_directory
+]
+sys.path[:0] = [_scripts_directory]
 
 _advisor_scripts_path = str(
-    Path(__file__).resolve().parent.parent / "_shared" / "advisor" / "scripts"
+    _scripts_directory_path.parent / "_shared" / "advisor" / "scripts"
 )
-if _advisor_scripts_path not in sys.path:
-    sys.path.insert(0, _advisor_scripts_path)
+sys.path[:] = [
+    each_existing_entry
+    for each_existing_entry in sys.path
+    if each_existing_entry != _advisor_scripts_path
+]
+sys.path[:0] = [_advisor_scripts_path]
 
+from tier_model_ids import detect_host_profile  # noqa: E402
 from advisor_scripts_constants.model_tier_run_validator_constants import (  # noqa: E402
     HOST_PROFILE_CLAUDE,
 )
@@ -94,14 +104,6 @@ from grok_headless_runner import (  # noqa: E402
     run_headless_worker,
 )
 from grok_worker_preflight import PreflightOutcome, run_preflight  # noqa: E402
-from tier_model_ids import detect_host_profile  # noqa: E402
-
-_HEADLESS_CHAIN_RUNNER_LOCK = threading.Lock()
-
-
-def _headless_chain_runner_lock() -> threading.Lock:
-    """Return the module lock that serializes headless chain-runner swaps."""
-    return _HEADLESS_CHAIN_RUNNER_LOCK
 
 
 @dataclass(frozen=True)
@@ -184,41 +186,34 @@ def _run_claude_with_headless_overrides(
     prompt_stdin: IO[str],
 ) -> ChainInvocationOutcome:
     working_directory_path = str(working_directory)
-    with _HEADLESS_CHAIN_RUNNER_LOCK:
-        previous_runner: TextCapturingSubprocessRunner = (
-            chain_runner.chain_subprocess_runner
-        )
 
-        def _runner_with_headless_overrides(
-            all_invocation_tokens: Sequence[str],
-            *all_positionals: object,
-            **all_keywords: object,
-        ) -> subprocess.CompletedProcess[str]:
-            del all_positionals
-            prompt_stdin.seek(0)
-            forwarded_text_codec = collect_forwarded_text_codec(all_keywords)
-            completed_process: subprocess.CompletedProcess[str] = previous_runner(
-                all_invocation_tokens,
-                capture_output=True,
-                text=True,
-                timeout=_timeout_seconds_from_keywords(all_keywords),
-                check=False,
-                stdin=prompt_stdin,
-                cwd=working_directory_path,
-                **forwarded_text_codec,
-            )
-            return completed_process
-
-        headless_runner: TextCapturingSubprocessRunner = (
-            _runner_with_headless_overrides
+    def _runner_with_headless_overrides(
+        all_invocation_tokens: Sequence[str],
+        *all_positionals: object,
+        **all_keywords: object,
+    ) -> subprocess.CompletedProcess[str]:
+        del all_positionals
+        prompt_stdin.seek(0)
+        forwarded_text_codec = collect_forwarded_text_codec(all_keywords)
+        completed_process: subprocess.CompletedProcess[str] = previous_runner(
+            all_invocation_tokens,
+            capture_output=True,
+            text=True,
+            timeout=_timeout_seconds_from_keywords(all_keywords),
+            check=False,
+            stdin=prompt_stdin,
+            cwd=working_directory_path,
+            **forwarded_text_codec,
+        )
+        return completed_process
+
+    headless_runner: TextCapturingSubprocessRunner = _runner_with_headless_overrides
+    with chain_runner.override_chain_subprocess_runner(
+        headless_runner
+    ) as previous_runner:
+        return spawn_claude_runner(
+            all_claude_arguments, timeout_seconds=timeout_seconds
         )
-        setattr(chain_runner, "chain_subprocess_runner", headless_runner)
-        try:
-            return spawn_claude_runner(
-                all_claude_arguments, timeout_seconds=timeout_seconds
-            )
-        finally:
-            setattr(chain_runner, "chain_subprocess_runner", previous_runner)
 
 
 def _prompt_file_unreadable_outcome(