macOS terminal declare -x output leak fixes

Fixes on record

Merged to main. A stamp counts the issues a fix is linked to.

• #16384 fix: strip leaked declare-x env dump from terminal output on macOS (#15459)

  merged to main

  files: tools/environments/base.py, tools/terminal_tool.py

  Show the diff

  • tools/environments/base.py

    @@ -386,9 +386,16 @@ def _wrap_command(self, command: str, cwd: str) -> str:
     
             parts = []
     
    -        # Source snapshot (env vars from previous commands)
    +        # Source snapshot (env vars from previous commands).
    +        # Redirect stdout to /dev/null: on macOS (bash 3.2 and certain
    +        # Homebrew bash builds) sourcing a file containing ``declare -x``
    +        # can emit the declarations to stdout, leaking ~60 lines of env
    +        # vars into every tool response (issue #15459).  Linux bash is
    +        # silent here, but the redirect is harmless.
             if self._snapshot_ready:
    -            parts.append(f"source {self._snapshot_path} 2>/dev/null || true")
    +            parts.append(
    +                f"source {self._snapshot_path} >/dev/null 2>&1 || true"
    +            )
     
             # Preserve bare ``~`` expansion, but rewrite ``~/...`` through
             # ``$HOME`` so suffixes with spaces remain a single shell word.

  • tools/terminal_tool.py

    @@ -1851,7 +1851,7 @@ def terminal_tool(
                 # Extract output
                 output = result.get("output", "")
                 returncode = result.get("returncode", 0)
    -            
    +
                 # Add helpful message for sudo failures in messaging context
                 output = _handle_sudo_failure(output, env_type)