langchain-agentx-python 2.4.6__tar.gz → 2.4.7__tar.gz

{langchain-agentx-python-2.4.6 → langchain-agentx-python-2.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-agentx-python
-Version: 2.4.6
+Version: 2.4.7
 Summary: LangChain/LangGraph-based agent utilities for CodeBaseX.
 Author-email: GoodMood2008 <GoodMood2008@users.noreply.github.com>
 License:                                  Apache License

{langchain-agentx-python-2.4.6 → langchain-agentx-python-2.4.7}/langchain_agentx/__init__.py

@@ -11,7 +11,7 @@ from langchain_agentx import create_loop_agent
 ```
 """
 
-__version__ = "2.4.6"
+__version__ = "2.4.7"
 
 from .mcp.call import McpToolCaller
 from .mcp.client_manager import McpClientManager, McpConnectedClient

{langchain-agentx-python-2.4.6 → langchain-agentx-python-2.4.7}/langchain_agentx/tools/bash/backend.py

@@ -42,6 +42,7 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, Protocol
 
+from .bash_exec_assembly import AssembledShellCommand, BashExecAssembler
 from .cwd_reporter import (
     BashCwdReporter,
     bash_single_quoted,
@@ -52,8 +53,6 @@ from .cwd_reporter import (
 from .sandbox_decision import BashSandboxDecision
 from .shell_locator import resolve_posix_shell
 from .task_runtime import BashTaskSnapshot, BashTaskStateMachine
-from .shell_quoting import append_stdin_redirect
-from .windows_shell_quoting import rewrite_windows_null_redirect
 
 # cwd 提取用的特殊 sentinel（不太可能出现在正常输出中）
 _CWD_SENTINEL = "__BASH_CWD_SENTINEL_63f8a2__"
@@ -159,14 +158,16 @@ def _cwd_invalid_execute_result(cwd: str | None, exc: BaseException) -> ExecuteR
     )
 
 
-def _merge_reset_into_result(
-    result: ExecuteResult, reset_stderr_prefix: str
+def _copy_execute_result(
+    result: ExecuteResult,
+    *,
+    stderr: str | None = None,
+    cwd_warning: str | None = None,
 ) -> ExecuteResult:
-    if not reset_stderr_prefix:
-        return result
+    """复制 ExecuteResult，保留 D2/D4 装配观测字段。"""
     return ExecuteResult(
         stdout=result.stdout,
-        stderr=reset_stderr_prefix + (result.stderr or ""),
+        stderr=result.stderr if stderr is None else stderr,
         exit_code=result.exit_code,
         interrupted=result.interrupted,
         cwd_after=result.cwd_after,
@@ -174,7 +175,22 @@ def _merge_reset_into_result(
         sandbox_bypass_reason=result.sandbox_bypass_reason,
         sandbox_temp_dir=result.sandbox_temp_dir,
         sandbox_violation_message=result.sandbox_violation_message,
-        cwd_warning=result.cwd_warning,
+        cwd_warning=result.cwd_warning if cwd_warning is None else cwd_warning,
+        command_before=result.command_before,
+        command_after=result.command_after,
+        shell_snapshot_path=result.shell_snapshot_path,
+        shell_login_flag=result.shell_login_flag,
+    )
+
+
+def _merge_reset_into_result(
+    result: ExecuteResult, reset_stderr_prefix: str
+) -> ExecuteResult:
+    if not reset_stderr_prefix:
+        return result
+    return _copy_execute_result(
+        result,
+        stderr=reset_stderr_prefix + (result.stderr or ""),
     )
 
 
@@ -187,16 +203,9 @@ def _post_process_execute_result(result: ExecuteResult) -> ExecuteResult:
     cleaned_stderr, cwd_warning = extract_cwd_warning(result.stderr)
     # 替换 stderr 为清理后的版本（UI 层看到干净的 stderr）
     # 同时设置 cwd_warning 字段（UI 层可直接使用）
-    return ExecuteResult(
-        stdout=result.stdout,
+    return _copy_execute_result(
+        result,
         stderr=cleaned_stderr,
-        exit_code=result.exit_code,
-        interrupted=result.interrupted,
-        cwd_after=result.cwd_after,
-        sandboxed=result.sandboxed,
-        sandbox_bypass_reason=result.sandbox_bypass_reason,
-        sandbox_temp_dir=result.sandbox_temp_dir,
-        sandbox_violation_message=result.sandbox_violation_message,
         cwd_warning=cwd_warning,
     )
 
@@ -235,6 +244,18 @@ class ExecuteResult:
     cwd_warning: str | None = None
     """从 stderr 中提取的 cwd 重置警告信息（结构化）。"""
 
+    command_before: str | None = None
+    """进入 preprocess 前的原始命令（D4 可观测）。"""
+
+    command_after: str | None = None
+    """preprocess + snapshot/extglob 装配后的命令串（cwd wrap 前）。"""
+
+    shell_snapshot_path: str | None = None
+    """本次使用的 shell 快照路径；None 表示回退 ``-l``。"""
+
+    shell_login_flag: bool = False
+    """spawn 是否带 ``-l``（无可用快照时为 True，对齐 CC getSpawnArgs）。"""
+
 
 @dataclass
 class BackgroundTask:
@@ -581,6 +602,10 @@ class BashBackend:
         sandbox_backend: BashSandboxBackendProtocol | None = None,
         sandbox_runtime_config: BashSandboxRuntimeConfig | None = None,
         posix_shell_executable: str | None = None,
+        *,
+        enable_shell_snapshot: bool = True,
+        shell_snapshot_path: str | None = None,
+        exec_assembler: BashExecAssembler | None = None,
         **_: Any,
     ) -> None:
         if sandbox_backend is not None:
@@ -592,6 +617,10 @@ class BashBackend:
                 config=sandbox_runtime_config,
             )
         self._posix_shell_override = posix_shell_executable
+        self._exec_assembler = exec_assembler or BashExecAssembler(
+            enable_snapshot=enable_shell_snapshot,
+            injected_snapshot_path=shell_snapshot_path,
+        )
 
     def _posix_shell_executable(self, env: dict[str, str]) -> str:
         """解析 argv[0]；测试可注入 `posix_shell_executable` 跳过 PATH 探测。"""
@@ -603,10 +632,27 @@ class BashBackend:
         merged.update(env)
         return resolve_posix_shell(environ=merged)
 
+    def _assemble_shell_command(
+        self, command: str, *, shell_exe: str
+    ) -> AssembledShellCommand:
+        """D2/D4：preprocess + snapshot/extglob 装配（对齐 CC bashProvider）。"""
+        return self._exec_assembler.assemble(command, shell_exe=shell_exe)
+
     def _preprocess_shell_command(self, command: str) -> str:
-        """进入 `-c` 包装前：win32 nul 纠偏 + stdin EOF（防交互阻塞，对齐 CC）。"""
-        command = rewrite_windows_null_redirect(command)
-        return append_stdin_redirect(command)
+        """兼容旧调用：仅返回 preprocess 后文本（不含 snapshot 链）。"""
+        from .bash_exec_assembly import preprocess_shell_command
+
+        return preprocess_shell_command(command).after
+
+    @staticmethod
+    def _attach_assembly_meta(
+        result: ExecuteResult, assembled: AssembledShellCommand
+    ) -> ExecuteResult:
+        result.command_before = assembled.preprocess.before
+        result.command_after = assembled.command_string
+        result.shell_snapshot_path = assembled.snapshot_path
+        result.shell_login_flag = assembled.use_login_shell
+        return result
 
     @staticmethod
     def _spawn_env_with_shell(env: dict[str, str], shell_exe: str) -> dict[str, str]:
@@ -727,7 +773,8 @@ class BashBackend:
         import subprocess as _sp
 
         shell_exe = self._posix_shell_executable(env)
-        command = self._preprocess_shell_command(command)
+        assembled = self._assemble_shell_command(command, shell_exe=shell_exe)
+        command = assembled.command_string
         effective_cwd, reset_prefix = _prepare_spawn_cwd(cwd, fallback=fallback_cwd)
         if effective_cwd is None:
             msg = reset_prefix.strip() or "Shell cwd invalid and no valid fallback"
@@ -737,6 +784,10 @@ class BashBackend:
                 interrupted=False,
                 stderr=msg + "\n",
                 cwd_warning=msg,
+                command_before=assembled.preprocess.before,
+                command_after=assembled.command_string,
+                shell_snapshot_path=assembled.snapshot_path,
+                shell_login_flag=assembled.use_login_shell,
             )
         read_fd = -1
         write_fd = -1
@@ -748,14 +799,16 @@ class BashBackend:
                     timeout_sec=timeout_sec,
                     env=env,
                     shell_exe=shell_exe,
+                    assembled=assembled,
                 )
                 return _merge_reset_into_result(result, reset_prefix)
 
             read_fd, write_fd = os.pipe()
             wrapped = BashCwdReporter.wrap_with_fd3(command, write_fd)
+            argv = assembled.spawn_argv(shell_exe, wrapped)
 
             proc = _sp.Popen(
-                [shell_exe, "-c", wrapped],
+                argv,
                 stdin=_sp.DEVNULL,
                 stdout=_sp.PIPE,
                 stderr=_sp.PIPE,
@@ -775,15 +828,18 @@ class BashBackend:
                 os.close(read_fd)
                 partial = stdout_bytes.decode("utf-8", errors="replace")
                 partial_stderr = stderr_bytes.decode("utf-8", errors="replace")
-                return _merge_reset_into_result(
-                    ExecuteResult(
-                        stdout=partial,
-                        stderr=partial_stderr,
-                        exit_code=-1,
-                        interrupted=True,
-                        cwd_after=cwd_after,
+                return self._attach_assembly_meta(
+                    _merge_reset_into_result(
+                        ExecuteResult(
+                            stdout=partial,
+                            stderr=partial_stderr,
+                            exit_code=-1,
+                            interrupted=True,
+                            cwd_after=cwd_after,
+                        ),
+                        reset_prefix,
                     ),
-                    reset_prefix,
+                    assembled,
                 )
 
             cwd_after = _read_fd_safe(read_fd)
@@ -792,21 +848,27 @@ class BashBackend:
 
             stdout_str = stdout_bytes.decode("utf-8", errors="replace")
             stderr_str = stderr_bytes.decode("utf-8", errors="replace")
-            return _merge_reset_into_result(
-                ExecuteResult(
-                    stdout=stdout_str,
-                    stderr=stderr_str,
-                    exit_code=proc.returncode,
-                    interrupted=False,
-                    cwd_after=cwd_after,
+            return self._attach_assembly_meta(
+                _merge_reset_into_result(
+                    ExecuteResult(
+                        stdout=stdout_str,
+                        stderr=stderr_str,
+                        exit_code=proc.returncode,
+                        interrupted=False,
+                        cwd_after=cwd_after,
+                    ),
+                    reset_prefix,
                 ),
-                reset_prefix,
+                assembled,
             )
         except FileNotFoundError:
-            return ExecuteResult(
-                stdout="bash: command not found",
-                exit_code=127,
-                interrupted=False,
+            return self._attach_assembly_meta(
+                ExecuteResult(
+                    stdout="bash: command not found",
+                    exit_code=127,
+                    interrupted=False,
+                ),
+                assembled,
             )
         except OSError as exc:
             if _is_cwd_spawn_oserror(exc):
@@ -832,6 +894,7 @@ class BashBackend:
         timeout_sec: int,
         env: dict[str, str],
         shell_exe: str,
+        assembled: AssembledShellCommand | None = None,
     ) -> ExecuteResult:
         fd, cwd_file = tempfile.mkstemp(prefix="agentx_bash_cwd_", suffix=".txt")
         os.close(fd)
@@ -840,11 +903,14 @@ class BashBackend:
             command, bash_single_quoted(posix_tgt)
         )
         spawn_env = self._spawn_env_with_shell(env, shell_exe)
+        if assembled is None:
+            assembled = self._assemble_shell_command(command, shell_exe=shell_exe)
+        argv = assembled.spawn_argv(shell_exe, wrapped)
         _cf = self._win32_creationflags()
         try:
             if _cf:
                 proc = subprocess.Popen(
-                    [shell_exe, "-c", wrapped],
+                    argv,
                     stdin=subprocess.DEVNULL,
                     stdout=subprocess.PIPE,
                     stderr=subprocess.PIPE,
@@ -854,7 +920,7 @@ class BashBackend:
                 )
             else:
                 proc = subprocess.Popen(
-                    [shell_exe, "-c", wrapped],
+                    argv,
                     stdin=subprocess.DEVNULL,
                     stdout=subprocess.PIPE,
                     stderr=subprocess.PIPE,
@@ -869,34 +935,46 @@ class BashBackend:
                 cwd_after = read_cwd_file(cwd_file)
                 partial = stdout_bytes.decode("utf-8", errors="replace")
                 partial_stderr = stderr_bytes.decode("utf-8", errors="replace")
-                return ExecuteResult(
-                    stdout=partial,
-                    stderr=partial_stderr,
-                    exit_code=-1,
-                    interrupted=True,
-                    cwd_after=cwd_after,
+                return self._attach_assembly_meta(
+                    ExecuteResult(
+                        stdout=partial,
+                        stderr=partial_stderr,
+                        exit_code=-1,
+                        interrupted=True,
+                        cwd_after=cwd_after,
+                    ),
+                    assembled,
                 )
 
             cwd_after = read_cwd_file(cwd_file)
             stdout_str = stdout_bytes.decode("utf-8", errors="replace")
             stderr_str = stderr_bytes.decode("utf-8", errors="replace")
-            return ExecuteResult(
-                stdout=stdout_str,
-                stderr=stderr_str,
-                exit_code=proc.returncode,
-                interrupted=False,
-                cwd_after=cwd_after,
+            return self._attach_assembly_meta(
+                ExecuteResult(
+                    stdout=stdout_str,
+                    stderr=stderr_str,
+                    exit_code=proc.returncode,
+                    interrupted=False,
+                    cwd_after=cwd_after,
+                ),
+                assembled,
             )
         except FileNotFoundError:
-            return ExecuteResult(
-                stdout="bash: command not found",
-                stderr="",
-                exit_code=127,
-                interrupted=False,
+            return self._attach_assembly_meta(
+                ExecuteResult(
+                    stdout="bash: command not found",
+                    stderr="",
+                    exit_code=127,
+                    interrupted=False,
+                ),
+                assembled,
             )
         except OSError as exc:
             if _is_cwd_spawn_oserror(exc):
-                return _cwd_invalid_execute_result(cwd, exc)
+                return self._attach_assembly_meta(
+                    _cwd_invalid_execute_result(cwd, exc),
+                    assembled,
+                )
             raise
         finally:
             try:
@@ -973,7 +1051,8 @@ class BashBackend:
         fallback_cwd: str | None = None,
     ) -> ExecuteResult:
         shell_exe = self._posix_shell_executable(env)
-        command = self._preprocess_shell_command(command)
+        assembled = self._assemble_shell_command(command, shell_exe=shell_exe)
+        command = assembled.command_string
         effective_cwd, reset_prefix = _prepare_spawn_cwd(cwd, fallback=fallback_cwd)
         if effective_cwd is None:
             msg = reset_prefix.strip() or "Shell cwd invalid and no valid fallback"
@@ -983,6 +1062,10 @@ class BashBackend:
                 interrupted=False,
                 stderr=msg + "\n",
                 cwd_warning=msg,
+                command_before=assembled.preprocess.before,
+                command_after=assembled.command_string,
+                shell_snapshot_path=assembled.snapshot_path,
+                shell_login_flag=assembled.use_login_shell,
             )
         read_fd = -1
         write_fd = -1
@@ -994,16 +1077,16 @@ class BashBackend:
                     timeout_sec=timeout_sec,
                     env=env,
                     shell_exe=shell_exe,
+                    assembled=assembled,
                 )
                 return _merge_reset_into_result(result, reset_prefix)
 
             read_fd, write_fd = os.pipe()
             wrapped = BashCwdReporter.wrap_with_fd3(command, write_fd)
+            argv = assembled.spawn_argv(shell_exe, wrapped)
 
             proc = await asyncio.create_subprocess_exec(
-                shell_exe,
-                "-c",
-                wrapped,
+                *argv,
                 stdin=asyncio.subprocess.DEVNULL,
                 stdout=asyncio.subprocess.PIPE,
                 stderr=asyncio.subprocess.PIPE,
@@ -1025,15 +1108,18 @@ class BashBackend:
                 cwd_after = _read_fd_safe(read_fd)
                 os.close(read_fd)
                 read_fd = -1
-                return _merge_reset_into_result(
-                    ExecuteResult(
-                        stdout="",
-                        stderr="",
-                        exit_code=-1,
-                        interrupted=True,
-                        cwd_after=cwd_after,
+                return self._attach_assembly_meta(
+                    _merge_reset_into_result(
+                        ExecuteResult(
+                            stdout="",
+                            stderr="",
+                            exit_code=-1,
+                            interrupted=True,
+                            cwd_after=cwd_after,
+                        ),
+                        reset_prefix,
                     ),
-                    reset_prefix,
+                    assembled,
                 )
 
             cwd_after = _read_fd_safe(read_fd)
@@ -1042,26 +1128,35 @@ class BashBackend:
 
             stdout_str = (stdout_bytes or b"").decode("utf-8", errors="replace")
             stderr_str = (stderr_bytes or b"").decode("utf-8", errors="replace")
-            return _merge_reset_into_result(
-                ExecuteResult(
-                    stdout=stdout_str,
-                    stderr=stderr_str,
-                    exit_code=proc.returncode or 0,
-                    interrupted=False,
-                    cwd_after=cwd_after,
+            return self._attach_assembly_meta(
+                _merge_reset_into_result(
+                    ExecuteResult(
+                        stdout=stdout_str,
+                        stderr=stderr_str,
+                        exit_code=proc.returncode or 0,
+                        interrupted=False,
+                        cwd_after=cwd_after,
+                    ),
+                    reset_prefix,
                 ),
-                reset_prefix,
+                assembled,
             )
         except FileNotFoundError:
-            return ExecuteResult(
-                stdout="bash: command not found",
-                stderr="",
-                exit_code=127,
-                interrupted=False,
+            return self._attach_assembly_meta(
+                ExecuteResult(
+                    stdout="bash: command not found",
+                    stderr="",
+                    exit_code=127,
+                    interrupted=False,
+                ),
+                assembled,
             )
         except OSError as exc:
             if _is_cwd_spawn_oserror(exc):
-                return _cwd_invalid_execute_result(effective_cwd or cwd, exc)
+                return self._attach_assembly_meta(
+                    _cwd_invalid_execute_result(effective_cwd or cwd, exc),
+                    assembled,
+                )
             raise
         finally:
             if write_fd != -1:
@@ -1083,6 +1178,7 @@ class BashBackend:
         timeout_sec: int,
         env: dict[str, str],
         shell_exe: str,
+        assembled: AssembledShellCommand | None = None,
     ) -> ExecuteResult:
         fd, cwd_file = tempfile.mkstemp(prefix="agentx_bash_cwd_", suffix=".txt")
         os.close(fd)
@@ -1091,13 +1187,14 @@ class BashBackend:
             command, bash_single_quoted(posix_tgt)
         )
         spawn_env = self._spawn_env_with_shell(env, shell_exe)
+        if assembled is None:
+            assembled = self._assemble_shell_command(command, shell_exe=shell_exe)
+        argv = assembled.spawn_argv(shell_exe, wrapped)
         _cf = self._win32_creationflags()
         try:
             if _cf:
                 proc = await asyncio.create_subprocess_exec(
-                    shell_exe,
-                    "-c",
-                    wrapped,
+                    *argv,
                     stdin=asyncio.subprocess.DEVNULL,
                     stdout=asyncio.subprocess.PIPE,
                     stderr=asyncio.subprocess.PIPE,
@@ -1107,9 +1204,7 @@ class BashBackend:
                 )
             else:
                 proc = await asyncio.create_subprocess_exec(
-                    shell_exe,
-                    "-c",
-                    wrapped,
+                    *argv,
                     stdin=asyncio.subprocess.DEVNULL,
                     stdout=asyncio.subprocess.PIPE,
                     stderr=asyncio.subprocess.PIPE,
@@ -1125,30 +1220,39 @@ class BashBackend:
                 proc.kill()
                 await proc.wait()
                 cwd_after = read_cwd_file(cwd_file)
-                return ExecuteResult(
-                    stdout="",
-                    stderr="",
-                    exit_code=-1,
-                    interrupted=True,
-                    cwd_after=cwd_after,
+                return self._attach_assembly_meta(
+                    ExecuteResult(
+                        stdout="",
+                        stderr="",
+                        exit_code=-1,
+                        interrupted=True,
+                        cwd_after=cwd_after,
+                    ),
+                    assembled,
                 )
 
             cwd_after = read_cwd_file(cwd_file)
             stdout_str = (stdout_bytes or b"").decode("utf-8", errors="replace")
             stderr_str = (stderr_bytes or b"").decode("utf-8", errors="replace")
-            return ExecuteResult(
-                stdout=stdout_str,
-                stderr=stderr_str,
-                exit_code=proc.returncode or 0,
-                interrupted=False,
-                cwd_after=cwd_after,
+            return self._attach_assembly_meta(
+                ExecuteResult(
+                    stdout=stdout_str,
+                    stderr=stderr_str,
+                    exit_code=proc.returncode or 0,
+                    interrupted=False,
+                    cwd_after=cwd_after,
+                ),
+                assembled,
             )
         except FileNotFoundError:
-            return ExecuteResult(
-                stdout="bash: command not found",
-                stderr="",
-                exit_code=127,
-                interrupted=False,
+            return self._attach_assembly_meta(
+                ExecuteResult(
+                    stdout="bash: command not found",
+                    stderr="",
+                    exit_code=127,
+                    interrupted=False,
+                ),
+                assembled,
             )
         except OSError as exc:
             if _is_cwd_spawn_oserror(exc):
@@ -1281,7 +1385,9 @@ class BashBackend:
                 )
                 return
             stream_env = self._sandbox_stream_env(request)
-            wrapped = self._build_stream_wrapper(self._preprocess_shell_command(command))
+            shell_exe = self._posix_shell_executable(stream_env)
+            assembled = self._assemble_shell_command(command, shell_exe=shell_exe)
+            wrapped = self._build_stream_wrapper(assembled.command_string)
             yield from self._stream_execute_raw_iter(
                 wrapped_command=wrapped,
                 cwd=effective_cwd,
@@ -1289,10 +1395,13 @@ class BashBackend:
                 env=stream_env,
                 cancel_event=cancel_event,
                 fallback_cwd=fallback_cwd,
+                assembled=assembled,
             )
             return
 
-        wrapped = self._build_stream_wrapper(self._preprocess_shell_command(command))
+        shell_exe = self._posix_shell_executable(effective_env)
+        assembled = self._assemble_shell_command(command, shell_exe=shell_exe)
+        wrapped = self._build_stream_wrapper(assembled.command_string)
         yield from self._stream_execute_raw_iter(
             wrapped_command=wrapped,
             cwd=cwd,
@@ -1300,6 +1409,7 @@ class BashBackend:
             env=effective_env,
             cancel_event=cancel_event,
             fallback_cwd=fallback_cwd,
+            assembled=assembled,
         )
 
     @staticmethod
@@ -1325,10 +1435,16 @@ class BashBackend:
         env: dict[str, str],
         cancel_event: threading.Event | None,
         fallback_cwd: str | None = None,
+        assembled: AssembledShellCommand | None = None,
     ) -> Iterator[BashStreamEvent]:
         marker = "__AGENTX_STREAM_CWD__"
         shell_exe = self._posix_shell_executable(env)
         spawn_env = self._spawn_env_with_shell(env, shell_exe)
+        if assembled is None:
+            assembled = self._assemble_shell_command(
+                wrapped_command, shell_exe=shell_exe
+            )
+        argv = assembled.spawn_argv(shell_exe, wrapped_command)
         effective_cwd, reset_prefix = _prepare_spawn_cwd(cwd, fallback=fallback_cwd)
         # effective_cwd is None 有两种情况：
         # 1. reset_prefix 为空：用户未指定 cwd，使用当前进程工作目录（有效）
@@ -1348,7 +1464,7 @@ class BashBackend:
         try:
             if _cf:
                 proc = subprocess.Popen(
-                    [shell_exe, "-c", wrapped_command],
+                    argv,
                     stdin=subprocess.DEVNULL,
                     stdout=subprocess.PIPE,
                     stderr=subprocess.STDOUT,
@@ -1360,7 +1476,7 @@ class BashBackend:
                 )
             else:
                 proc = subprocess.Popen(
-                    [shell_exe, "-c", wrapped_command],
+                    argv,
                     stdin=subprocess.DEVNULL,
                     stdout=subprocess.PIPE,
                     stderr=subprocess.STDOUT,
@@ -1553,7 +1669,9 @@ class BashBackend:
         output_file = open(output_path, "wb")  # noqa: WPS515
         exit_code_path = os.path.join(task_dir, "exit_code")
 
-        command = self._preprocess_shell_command(command)
+        shell_exe = self._posix_shell_executable(env)
+        assembled = self._assemble_shell_command(command, shell_exe=shell_exe)
+        command = assembled.command_string
         quoted_exit_code_path = shlex.quote(exit_code_path)
         wrapped = (
             "{ "
@@ -1563,12 +1681,12 @@ class BashBackend:
             "exit $__AGENTX_EC; "
             "}"
         )
-        shell_exe = self._posix_shell_executable(env)
         spawn_env = self._spawn_env_with_shell(env, shell_exe)
+        argv = assembled.spawn_argv(shell_exe, wrapped)
         _cf = self._win32_creationflags()
         if _cf:
             proc = subprocess.Popen(
-                [shell_exe, "-c", wrapped],
+                argv,
                 stdin=subprocess.DEVNULL,
                 stdout=output_file,
                 stderr=subprocess.STDOUT,
@@ -1579,7 +1697,7 @@ class BashBackend:
             )
         else:
             proc = subprocess.Popen(
-                [shell_exe, "-c", wrapped],
+                argv,
                 stdin=subprocess.DEVNULL,
                 stdout=output_file,
                 stderr=subprocess.STDOUT,