refactor(proxy-client): упростить установщик пакета и shell-тесты

- install.sh ставит три прямые ссылки без Stow; чужие файлы не трогает
  и перечисляет все конфликты сразу; ~/.local и ~/.config могут быть
  ссылками; блок в ~/.bashrc дописывается, если нет маркера.
- proxy_on читает вывод proxy-client env без временного файла.
- Тесты Bash-функций работают через поддельный PROXY_CLIENT_BIN.
- test_proxy_client_full.sh запускает только тесты proxy-client,
  прогон под Python 3.8 — если есть uv.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>

proxy-client/.config/proxy-client/shell.bash

@@ -5,21 +5,17 @@ _proxy_cli() {
   "${PROXY_CLIENT_BIN:-proxy-client}" "$@"
 }
 
-_proxy_apply_env_file() {
+# Применяет вывод "proxy-client env" целиком или не применяет ничего.
-  local output_file="$1" line key value
+_proxy_apply_env() {
+  local line key
   local -A proxy_values=()
-  local -a allowed_keys=(
-    HTTP_PROXY HTTPS_PROXY ALL_PROXY NO_PROXY
-    http_proxy https_proxy all_proxy no_proxy
-  )
 
-  while IFS= read -r line || [ -n "$line" ]; do
+  while IFS= read -r line; do
     if [[ "$line" != *=* ]]; then
       echo "Ошибка: proxy-client env вернул строку без '='" >&2
       return 1
     fi
     key="${line%%=*}"
-    value="${line#*=}"
     case "$key" in
       HTTP_PROXY|HTTPS_PROXY|ALL_PROXY|NO_PROXY|http_proxy|https_proxy|all_proxy|no_proxy) ;;
       *)
@@ -27,38 +23,20 @@ _proxy_apply_env_file() {
         return 1
         ;;
     esac
-    proxy_values["$key"]="$value"
+    proxy_values["$key"]="${line#*=}"
-  done < "$output_file"
+  done <<< "$1"
 
-  for key in "${allowed_keys[@]}"; do
+  for key in "${!proxy_values[@]}"; do
-    if [[ -n "${proxy_values[$key]+set}" ]]; then
+    export "$key=${proxy_values[$key]}"
-      printf -v "$key" '%s' "${proxy_values[$key]}"
-      export "$key"
-    fi
   done
 }
 
 proxy_on() {
-  local output_file old_umask
+  local output
-  old_umask="$(umask)"
+  if ! output="$(_proxy_cli env)" || ! _proxy_apply_env "$output"; then
-  umask 077
-  if ! output_file="$(mktemp "${TMPDIR:-/tmp}/proxy-client-env.XXXXXX")"; then
-    umask "$old_umask"
-    echo "Ошибка: не удалось создать временный файл для proxy-env" >&2
-    return 1
-  fi
-  umask "$old_umask"
-  if ! _proxy_cli env > "$output_file"; then
-    rm -f "$output_file"
     echo "Ошибка: прокси не включён" >&2
     return 1
   fi
-  if ! _proxy_apply_env_file "$output_file"; then
-    rm -f "$output_file"
-    echo "Ошибка: прокси не включён" >&2
-    return 1
-  fi
-  rm -f "$output_file"
   echo "Прокси включён"
 }
 

proxy-client/install.sh

@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
+# Ставит proxy-client в домашний каталог: три ссылки на этот каталог и
+# (по умолчанию) блок в ~/.bashrc. Повторный запуск ничего не меняет.
 set -euo pipefail
 
 PACKAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
-STOW_BIN="${STOW_BIN:-stow}"
 SETUP_SHELL=1
 
 usage() {
@@ -15,9 +16,7 @@ EOF
 
 while [ "$#" -gt 0 ]; do
   case "$1" in
-    --no-shell-setup)
+    --no-shell-setup) SETUP_SHELL=0 ;;
-      SETUP_SHELL=0
-      ;;
     -h|--help)
       usage
       exit 0
@@ -31,180 +30,58 @@ while [ "$#" -gt 0 ]; do
   shift
 done
 
-SOURCES=(
+# Машинные config и default.url сюда не входят: они живут только в $HOME.
-  "$PACKAGE_DIR/.local/bin/proxy-client"
+LINKS=(
-  "$PACKAGE_DIR/.config/proxy-client/shell.bash"
+  .local/bin/proxy-client
-  "$PACKAGE_DIR/.config/proxy-client/examples"
+  .config/proxy-client/shell.bash
-)
+  .config/proxy-client/examples
-TARGETS=(
-  "$HOME/.local/bin/proxy-client"
-  "$HOME/.config/proxy-client/shell.bash"
-  "$HOME/.config/proxy-client/examples"
-)
-STOW_IGNORE_PATTERNS=(
-  '^\.local/bin/proxy-client$'
-  '^\.config/proxy-client/shell\.bash$'
-  '^\.config/proxy-client/examples$'
 )
 
-source_errors=()
+# Существующая ссылка на этот же файл пакета — не конфликт, всё остальное
-[ -x "${SOURCES[0]}" ] || source_errors+=("${SOURCES[0]}")
+# (включая битую ссылку) не трогаем.
-[ -f "${SOURCES[1]}" ] || source_errors+=("${SOURCES[1]}")
-[ -d "${SOURCES[2]}" ] || source_errors+=("${SOURCES[2]}")
-if [ "${#source_errors[@]}" -gt 0 ]; then
-  echo "Ошибка: отсутствуют обязательные файлы исходного пакета:" >&2
-  printf '  %s\n' "${source_errors[@]}" >&2
-  exit 1
-fi
-
-"${SOURCES[0]}" --help >/dev/null
-bash -n "${SOURCES[1]}"
-
-SHELL_BLOCK_START='# >>> proxy-client >>>'
-SHELL_BLOCK_END='# <<< proxy-client <<<'
-SHELL_SETUP_NEEDED=0
-BASH_CUSTOM_HAS_MODULE=0
-SHELL_PATH_NEEDED=1
-SHELL_SOURCE_NEEDED=1
-SHELL_BLOCK_CONFLICT=0
-if [ "$SETUP_SHELL" -eq 1 ]; then
-  if [ -f "$HOME/.bash_custom" ] \
-    && grep -Fq 'proxy-client/shell.bash' "$HOME/.bash_custom"; then
-    BASH_CUSTOM_HAS_MODULE=1
-    SHELL_SOURCE_NEEDED=0
-  fi
-
-  bashrc_start_count=0
-  bashrc_end_count=0
-  if [ -f "$HOME/.bashrc" ]; then
-    bashrc_start_count="$(
-      grep -Fxc "$SHELL_BLOCK_START" "$HOME/.bashrc" || true
-    )"
-    bashrc_end_count="$(
-      grep -Fxc "$SHELL_BLOCK_END" "$HOME/.bashrc" || true
-    )"
-    if grep -Fq 'export PATH="$HOME/.local/bin:$PATH"' "$HOME/.bashrc"; then
-      SHELL_PATH_NEEDED=0
-    fi
-  fi
-
-  if [ "$bashrc_start_count" -eq 0 ] && [ "$bashrc_end_count" -eq 0 ]; then
-    if [ "$SHELL_PATH_NEEDED" -eq 1 ] \
-      || [ "$SHELL_SOURCE_NEEDED" -eq 1 ]; then
-      SHELL_SETUP_NEEDED=1
-    fi
-  elif [ "$bashrc_start_count" -eq 1 ] \
-    && [ "$bashrc_end_count" -eq 1 ] \
-    && [ "$SHELL_PATH_NEEDED" -eq 0 ] \
-    && { [ "$BASH_CUSTOM_HAS_MODULE" -eq 1 ] \
-      || grep -Fq 'proxy-client/shell.bash' "$HOME/.bashrc"; }; then
-    :
-  else
-    SHELL_BLOCK_CONFLICT=1
-  fi
-fi
-
 conflicts=()
-missing_targets=0
+for link in "${LINKS[@]}"; do
-stow_ignore_args=()
+  target="$HOME/$link"
-PARENT_DIRS=(
-  "$HOME/.local"
-  "$HOME/.local/bin"
-  "$HOME/.config"
-  "$HOME/.config/proxy-client"
-)
-for parent_dir in "${PARENT_DIRS[@]}"; do
-  if { [ -e "$parent_dir" ] || [ -L "$parent_dir" ]; } \
-    && { [ ! -d "$parent_dir" ] || [ -L "$parent_dir" ]; }; then
-    conflicts+=("$parent_dir")
-  fi
-done
-
-for index in "${!TARGETS[@]}"; do
-  target="${TARGETS[$index]}"
-  source_path="${SOURCES[$index]}"
   if [ -e "$target" ] || [ -L "$target" ]; then
-    if [ ! -L "$target" ] \
+    if [ "$(readlink -f "$target" 2>/dev/null)" != "$PACKAGE_DIR/$link" ]; then
-      || [ "$(readlink -f "$target" 2>/dev/null || true)" != "$source_path" ]; then
       conflicts+=("$target")
-    else
-      stow_ignore_args+=("--ignore=${STOW_IGNORE_PATTERNS[$index]}")
     fi
-  else
-    missing_targets=$((missing_targets + 1))
   fi
 done
 
-if [ "$SHELL_SETUP_NEEDED" -eq 1 ] \
-  && { [ -e "$HOME/.bashrc" ] || [ -L "$HOME/.bashrc" ]; } \
-  && [ ! -f "$HOME/.bashrc" ]; then
-  conflicts+=("$HOME/.bashrc")
-fi
-if [ "$SHELL_BLOCK_CONFLICT" -eq 1 ]; then
-  conflicts+=("$HOME/.bashrc")
-fi
-
 if [ "${#conflicts[@]}" -gt 0 ]; then
-  echo "Ошибка: найдены конфликтующие пути:" >&2
+  echo "Ошибка: пути уже заняты, установка не выполнена:" >&2
   printf '  %s\n' "${conflicts[@]}" >&2
-  echo "Разберите их вручную и повторите установку." >&2
+  echo "Удалите или переименуйте их и повторите установку." >&2
   exit 1
 fi
 
 mkdir -p "$HOME/.local/bin" "$HOME/.config/proxy-client"
-
+for link in "${LINKS[@]}"; do
-if command -v "$STOW_BIN" >/dev/null 2>&1; then
+  [ -e "$HOME/$link" ] || ln -s "$PACKAGE_DIR/$link" "$HOME/$link"
-  echo "Установка с помощью Stow."
-  if [ "$missing_targets" -gt 0 ]; then
-    "$STOW_BIN" --dir="$(dirname "$PACKAGE_DIR")" --target="$HOME" \
-      "${stow_ignore_args[@]}" \
-      "$(basename "$PACKAGE_DIR")"
-  fi
-else
-  echo "Установка без Stow: создаю символические ссылки напрямую."
-  for index in "${!TARGETS[@]}"; do
-    target="${TARGETS[$index]}"
-    source_path="${SOURCES[$index]}"
-    if [ ! -L "$target" ]; then
-      ln -s "$source_path" "$target"
-    fi
 done
-fi
 
-"$HOME/.local/bin/proxy-client" --help >/dev/null
+SHELL_BLOCK_START='# >>> proxy-client >>>'
-bash -n "$HOME/.config/proxy-client/shell.bash"
+if [ "$SETUP_SHELL" -eq 0 ]; then
+  echo "Настройка Bash пропущена (--no-shell-setup)."
+  # Команда для пользователя: $HOME и $PATH раскроются в его сессии.
+  # shellcheck disable=SC2016
+  RELOAD_COMMAND='export PATH="$HOME/.local/bin:$PATH"; source ~/.config/proxy-client/shell.bash'
+else
+  if ! grep -Fqx "$SHELL_BLOCK_START" "$HOME/.bashrc" 2>/dev/null; then
+    cat >> "$HOME/.bashrc" <<EOF
 
-if [ "$SHELL_SETUP_NEEDED" -eq 1 ]; then
+$SHELL_BLOCK_START
-  cat >> "$HOME/.bashrc" <<'EOF'
+case ":\$PATH:" in
-
+  *":\$HOME/.local/bin:"*) ;;
-# >>> proxy-client >>>
+  *) export PATH="\$HOME/.local/bin:\$PATH" ;;
-EOF
-  if [ "$SHELL_PATH_NEEDED" -eq 1 ]; then
-    cat >> "$HOME/.bashrc" <<'EOF'
-case ":$PATH:" in
-  *":$HOME/.local/bin:"*) ;;
-  *)
-    export PATH="$HOME/.local/bin:$PATH"
-    ;;
 esac
-EOF
+[ -f "\$HOME/.config/proxy-client/shell.bash" ] && source "\$HOME/.config/proxy-client/shell.bash"
-  fi
-  if [ "$SHELL_SOURCE_NEEDED" -eq 1 ]; then
-    cat >> "$HOME/.bashrc" <<'EOF'
-[ -f "$HOME/.config/proxy-client/shell.bash" ] && source "$HOME/.config/proxy-client/shell.bash"
-EOF
-  fi
-  cat >> "$HOME/.bashrc" <<'EOF'
 # <<< proxy-client <<<
 EOF
-elif [ "$SETUP_SHELL" -eq 0 ]; then
+    echo "В ~/.bashrc добавлен блок proxy-client."
-  echo "Настройка Bash пропущена (--no-shell-setup)."
   fi
-
-if [ "$SETUP_SHELL" -eq 1 ]; then
   RELOAD_COMMAND='source ~/.bashrc'
-else
-  RELOAD_COMMAND='export PATH="$HOME/.local/bin:$PATH"; source ~/.config/proxy-client/shell.bash'
 fi
 
 cat <<EOF

tests/test_proxy_client_full.sh

@@ -1,19 +1,17 @@
 #!/usr/bin/env bash
+# Все тесты proxy-client: Python-тесты (текущий python3 и, если есть uv,
+# Python 3.8 — минимальная поддерживаемая версия) и shell-тесты.
 set -euo pipefail
 
-REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$(dirname "${BASH_SOURCE[0]}")/.."
-cd "$REPO_ROOT"
-
-if ! command -v uv >/dev/null 2>&1; then
-  echo "Ошибка: для полной проверки требуется uv" >&2
-  exit 1
-fi
-
 export PYTHONDONTWRITEBYTECODE=1
 
-python3 -m unittest discover -s tests
+python3 -m unittest discover -s tests -p 'test_proxy_*.py'
+if command -v uv >/dev/null 2>&1; then
+  uv run --python 3.8 --no-project \
+    python -m unittest discover -s tests -p 'test_proxy_*.py'
+else
+  echo "Предупреждение: uv не найден, прогон под Python 3.8 пропущен" >&2
+fi
 bash tests/test_proxy_launchers.sh
-bash tests/test_chatgpt_proxy_launcher.sh
 bash tests/test_proxy_client_install.sh
-bash tests/test_install.sh
-uv run --python 3.8 --no-project python -m unittest discover -s tests

tests/test_proxy_client_install.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Тесты пакетного установщика proxy-client/install.sh во временном HOME.
 set -euo pipefail
 
 REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
@@ -10,393 +11,168 @@ fail() {
   exit 1
 }
 
+ok() {
+  echo "ok - $*"
+}
+
 assert_link_points_to() {
-  local link_path="$1" expected_path="$2" actual_path
+  local link_path="$1" expected_path="$2"
-  [ -L "$link_path" ] || fail "Expected symlink: $link_path"
+  [ -L "$link_path" ] || fail "нет ссылки $link_path"
-  actual_path="$(readlink -f "$link_path")"
+  [ "$(readlink -f "$link_path")" = "$expected_path" ] \
-  [ "$actual_path" = "$expected_path" ] \
+    || fail "$link_path указывает не на $expected_path"
-    || fail "$link_path points to $actual_path, expected $expected_path"
 }
 
 assert_not_exists() {
-  local path="$1"
+  [ ! -e "$1" ] && [ ! -L "$1" ] || fail "путь не должен существовать: $1"
-  [ ! -e "$path" ] && [ ! -L "$path" ] || fail "Path should not exist: $path"
 }
 
-setup_package() {
+assert_package_links() {
-  local fixture_root="$1" package_dir="$fixture_root/source with spaces/proxy-client"
+  local package_dir="$1" home_dir="$2" link
-  mkdir -p \
+  for link in .local/bin/proxy-client .config/proxy-client/shell.bash \
-    "$package_dir/.local/bin" \
+              .config/proxy-client/examples; do
-    "$package_dir/.config/proxy-client"
+    assert_link_points_to "$home_dir/$link" "$package_dir/$link"
-  cp -a \
-    "$REPO_ROOT/proxy-client/.local/bin/proxy-client" \
-    "$package_dir/.local/bin/proxy-client"
-  cp -a \
-    "$REPO_ROOT/proxy-client/.config/proxy-client/shell.bash" \
-    "$REPO_ROOT/proxy-client/.config/proxy-client/examples" \
-    "$package_dir/.config/proxy-client/"
-  cp -a \
-    "$REPO_ROOT/proxy-client/.stow-local-ignore" \
-    "$REPO_ROOT/proxy-client/README.md" \
-    "$REPO_ROOT/proxy-client/install.sh" \
-    "$package_dir/"
-  printf '%s\n' 'MACHINE_CONFIG_SENTINEL' > "$package_dir/.config/proxy-client/config"
-  printf '%s\n' 'PRIVATE_PROFILE_SENTINEL' > "$package_dir/.config/proxy-client/default.url"
-  printf '%s\n' "$package_dir"
-}
-
-run_package_install() {
-  local package_dir="$1" home_dir="$2" stow_bin="$3"
-  shift 3
-  (
-    cd "$TEST_TMP_ROOT"
-    HOME="$home_dir" STOW_BIN="$stow_bin" \
-      "$package_dir/install.sh" "$@"
-  )
-}
-
-test_installs_same_public_artifacts_without_stow() {
-  local fixture_root package_dir home_dir output
-  fixture_root="$(mktemp -d "$TEST_TMP_ROOT/fixture.XXXXXX")"
-  package_dir="$(setup_package "$fixture_root")"
-  home_dir="$fixture_root/home"
-  mkdir -p "$home_dir"
-
-  output="$(
-    run_package_install "$package_dir" "$home_dir" missing-stow --no-shell-setup
-  )"
-
-  printf '%s' "$output" | grep -Fq 'без Stow' \
-    || fail "Expected direct-symlink method in output"
-  printf '%s' "$output" | grep -Fq \
-    'export PATH="$HOME/.local/bin:$PATH"; source ~/.config/proxy-client/shell.bash' \
-    || fail "Expected complete current-session hint with --no-shell-setup"
-  [ -d "$home_dir/.local/bin" ] && [ ! -L "$home_dir/.local/bin" ] \
-    || fail "Expected ~/.local/bin to be a real directory"
-  [ -d "$home_dir/.config/proxy-client" ] \
-    && [ ! -L "$home_dir/.config/proxy-client" ] \
-    || fail "Expected proxy-client config home to be a real directory"
-  assert_link_points_to \
-    "$home_dir/.local/bin/proxy-client" \
-    "$package_dir/.local/bin/proxy-client"
-  assert_link_points_to \
-    "$home_dir/.config/proxy-client/shell.bash" \
-    "$package_dir/.config/proxy-client/shell.bash"
-  assert_link_points_to \
-    "$home_dir/.config/proxy-client/examples" \
-    "$package_dir/.config/proxy-client/examples"
-  assert_not_exists "$home_dir/.config/proxy-client/config"
-  assert_not_exists "$home_dir/.config/proxy-client/default.url"
-  assert_not_exists "$home_dir/README.md"
-  assert_not_exists "$home_dir/install.sh"
-  assert_not_exists "$home_dir/.bashrc"
-}
-
-test_configures_bash_once_by_default() {
-  local fixture_root package_dir home_dir output marker_count path_count source_count
-  fixture_root="$(mktemp -d "$TEST_TMP_ROOT/fixture.XXXXXX")"
-  package_dir="$(setup_package "$fixture_root")"
-  home_dir="$fixture_root/home"
-  mkdir -p "$home_dir"
-
-  run_package_install "$package_dir" "$home_dir" missing-stow >/dev/null
-  output="$(run_package_install "$package_dir" "$home_dir" missing-stow)"
-
-  marker_count="$(grep -Fxc '# >>> proxy-client >>>' "$home_dir/.bashrc")"
-  path_count="$(grep -Fc 'export PATH="$HOME/.local/bin:$PATH"' "$home_dir/.bashrc")"
-  source_count="$(
-    grep -Fc \
-      '[ -f "$HOME/.config/proxy-client/shell.bash" ] && source "$HOME/.config/proxy-client/shell.bash"' \
-      "$home_dir/.bashrc"
-  )"
-  [ "$marker_count" -eq 1 ] || fail "Expected one managed Bash block"
-  [ "$path_count" -eq 1 ] || fail "Expected one ~/.local/bin PATH line"
-  [ "$source_count" -eq 1 ] || fail "Expected one shell module source line"
-  printf '%s' "$output" | grep -Fq 'source ~/.bashrc' \
-    || fail "Expected current-session reload hint"
-}
-
-test_installs_same_public_artifacts_with_stow() {
-  local fixture_root package_dir home_dir output
-  fixture_root="$(mktemp -d "$TEST_TMP_ROOT/fixture.XXXXXX")"
-  package_dir="$(setup_package "$fixture_root")"
-  home_dir="$fixture_root/home"
-  mkdir -p "$home_dir"
-
-  output="$(run_package_install "$package_dir" "$home_dir" stow --no-shell-setup)"
-
-  printf '%s' "$output" | grep -Fq 'с помощью Stow' \
-    || fail "Expected Stow method in output"
-  [ -d "$home_dir/.local/bin" ] && [ ! -L "$home_dir/.local/bin" ] \
-    || fail "Expected ~/.local/bin to be a real directory"
-  [ -d "$home_dir/.config/proxy-client" ] \
-    && [ ! -L "$home_dir/.config/proxy-client" ] \
-    || fail "Expected proxy-client config home to be a real directory"
-  assert_link_points_to \
-    "$home_dir/.local/bin/proxy-client" \
-    "$package_dir/.local/bin/proxy-client"
-  assert_link_points_to \
-    "$home_dir/.config/proxy-client/shell.bash" \
-    "$package_dir/.config/proxy-client/shell.bash"
-  assert_link_points_to \
-    "$home_dir/.config/proxy-client/examples" \
-    "$package_dir/.config/proxy-client/examples"
-  assert_not_exists "$home_dir/.config/proxy-client/config"
-  assert_not_exists "$home_dir/.config/proxy-client/default.url"
-  assert_not_exists "$home_dir/README.md"
-  assert_not_exists "$home_dir/install.sh"
-}
-
-test_rejects_linked_parent_directories_before_changes() {
-  local fixture_root package_dir home_dir external_local external_config output
-  fixture_root="$(mktemp -d "$TEST_TMP_ROOT/fixture.XXXXXX")"
-  package_dir="$(setup_package "$fixture_root")"
-  home_dir="$fixture_root/home"
-  external_local="$fixture_root/external-local"
-  external_config="$fixture_root/external-config"
-  mkdir -p "$home_dir" "$external_local" "$external_config"
-  ln -s "$external_local" "$home_dir/.local"
-  ln -s "$external_config" "$home_dir/.config"
-
-  if output="$(
-    run_package_install "$package_dir" "$home_dir" missing-stow 2>&1
-  )"; then
-    fail "Expected linked parent directories to be rejected"
-  fi
-
-  printf '%s' "$output" | grep -Fq "$home_dir/.local" \
-    || fail "Expected ~/.local conflict in output"
-  printf '%s' "$output" | grep -Fq "$home_dir/.config" \
-    || fail "Expected ~/.config conflict in output"
-  assert_not_exists "$external_local/bin"
-  assert_not_exists "$external_config/proxy-client"
-  assert_not_exists "$home_dir/.bashrc"
-}
-
-test_reports_all_target_conflicts_without_partial_install() {
-  local fixture_root package_dir home_dir other_target output
-  fixture_root="$(mktemp -d "$TEST_TMP_ROOT/fixture.XXXXXX")"
-  package_dir="$(setup_package "$fixture_root")"
-  home_dir="$fixture_root/home"
-  other_target="$fixture_root/other-target"
-  mkdir -p "$home_dir/.local/bin" "$home_dir/.config/proxy-client/shell.bash"
-  printf '%s\n' 'KEEP_CLI' > "$home_dir/.local/bin/proxy-client"
-  printf '%s\n' 'KEEP_TARGET' > "$other_target"
-  ln -s "$other_target" "$home_dir/.config/proxy-client/examples"
-
-  if output="$(
-    run_package_install "$package_dir" "$home_dir" missing-stow 2>&1
-  )"; then
-    fail "Expected all target conflicts to be rejected"
-  fi
-
-  printf '%s' "$output" | grep -Fq "$home_dir/.local/bin/proxy-client" \
-    || fail "Expected CLI conflict in output"
-  printf '%s' "$output" | grep -Fq "$home_dir/.config/proxy-client/shell.bash" \
-    || fail "Expected shell module conflict in output"
-  printf '%s' "$output" | grep -Fq "$home_dir/.config/proxy-client/examples" \
-    || fail "Expected examples conflict in output"
-  grep -Fq 'KEEP_CLI' "$home_dir/.local/bin/proxy-client" \
-    || fail "Expected conflicting CLI file to stay unchanged"
-  [ -d "$home_dir/.config/proxy-client/shell.bash" ] \
-    || fail "Expected conflicting shell directory to stay unchanged"
-  assert_link_points_to "$home_dir/.config/proxy-client/examples" "$other_target"
-  assert_not_exists "$home_dir/.bashrc"
-}
-
-test_rejects_broken_link_without_creating_other_targets() {
-  local fixture_root package_dir home_dir output
-  fixture_root="$(mktemp -d "$TEST_TMP_ROOT/fixture.XXXXXX")"
-  package_dir="$(setup_package "$fixture_root")"
-  home_dir="$fixture_root/home"
-  mkdir -p "$home_dir/.local/bin"
-  ln -s "$fixture_root/missing-cli" "$home_dir/.local/bin/proxy-client"
-
-  if output="$(
-    run_package_install "$package_dir" "$home_dir" missing-stow 2>&1
-  )"; then
-    fail "Expected broken target link to be rejected"
-  fi
-
-  printf '%s' "$output" | grep -Fq "$home_dir/.local/bin/proxy-client" \
-    || fail "Expected broken CLI link in output"
-  [ -L "$home_dir/.local/bin/proxy-client" ] \
-    || fail "Expected broken CLI link to stay unchanged"
-  assert_not_exists "$home_dir/.config"
-  assert_not_exists "$home_dir/.bashrc"
-}
-
-test_preserves_machine_files_with_both_methods() {
-  local stow_bin fixture_root package_dir home_dir
-  for stow_bin in missing-stow stow; do
-    fixture_root="$(mktemp -d "$TEST_TMP_ROOT/fixture.XXXXXX")"
-    package_dir="$(setup_package "$fixture_root")"
-    home_dir="$fixture_root/home"
-    mkdir -p "$home_dir/.config/proxy-client"
-    printf '%s\n' 'HOME_CONFIG_SENTINEL' \
-      > "$home_dir/.config/proxy-client/config"
-    printf '%s\n' 'HOME_PROFILE_SENTINEL' \
-      > "$home_dir/.config/proxy-client/default.url"
-
-    run_package_install "$package_dir" "$home_dir" "$stow_bin" \
-      --no-shell-setup >/dev/null
-
-    [ ! -L "$home_dir/.config/proxy-client/config" ] \
-      || fail "Machine config must not become a symlink"
-    [ ! -L "$home_dir/.config/proxy-client/default.url" ] \
-      || fail "Private profile must not become a symlink"
-    grep -Fq 'HOME_CONFIG_SENTINEL' "$home_dir/.config/proxy-client/config" \
-      || fail "Machine config changed"
-    grep -Fq 'HOME_PROFILE_SENTINEL' "$home_dir/.config/proxy-client/default.url" \
-      || fail "Private profile changed"
   done
 }
 
-test_accepts_existing_links_when_method_changes() {
+# Копия пакета в пути с пробелами и машинными файлами, которые установщик
-  local fixture_root package_dir home_dir
+# не должен трогать. Печатает путь к пакету; HOME создаётся рядом.
-  fixture_root="$(mktemp -d "$TEST_TMP_ROOT/fixture.XXXXXX")"
+new_fixture() {
-  package_dir="$(setup_package "$fixture_root")"
+  local fixture package_dir
-  home_dir="$fixture_root/home"
+  fixture="$(mktemp -d "$TEST_TMP_ROOT/fixture.XXXXXX")"
-  mkdir -p "$home_dir"
+  package_dir="$fixture/source with spaces/proxy-client"
-
+  mkdir -p "$package_dir" "$fixture/home"
-  run_package_install "$package_dir" "$home_dir" missing-stow \
+  cp -a "$REPO_ROOT/proxy-client/." "$package_dir/"
-    --no-shell-setup >/dev/null
+  printf 'MACHINE_CONFIG_SENTINEL\n' > "$package_dir/.config/proxy-client/config"
-  run_package_install "$package_dir" "$home_dir" stow \
+  printf 'PRIVATE_PROFILE_SENTINEL\n' > "$package_dir/.config/proxy-client/default.url"
-    --no-shell-setup >/dev/null
+  printf '%s\n' "$fixture"
-
-  assert_link_points_to \
-    "$home_dir/.local/bin/proxy-client" \
-    "$package_dir/.local/bin/proxy-client"
-  assert_link_points_to \
-    "$home_dir/.config/proxy-client/shell.bash" \
-    "$package_dir/.config/proxy-client/shell.bash"
-  assert_link_points_to \
-    "$home_dir/.config/proxy-client/examples" \
-    "$package_dir/.config/proxy-client/examples"
 }
 
-test_stow_completes_partial_correct_installation() {
+run_install() {
-  local fixture_root package_dir home_dir
+  local fixture="$1"
-  fixture_root="$(mktemp -d "$TEST_TMP_ROOT/fixture.XXXXXX")"
+  shift
-  package_dir="$(setup_package "$fixture_root")"
+  (cd "$TEST_TMP_ROOT" && HOME="$fixture/home" \
-  home_dir="$fixture_root/home"
+    "$fixture/source with spaces/proxy-client/install.sh" "$@")
-  mkdir -p "$home_dir"
-
-  run_package_install "$package_dir" "$home_dir" missing-stow \
-    --no-shell-setup >/dev/null
-  rm "$home_dir/.config/proxy-client/shell.bash"
-
-  run_package_install "$package_dir" "$home_dir" stow \
-    --no-shell-setup >/dev/null
-
-  assert_link_points_to \
-    "$home_dir/.local/bin/proxy-client" \
-    "$package_dir/.local/bin/proxy-client"
-  assert_link_points_to \
-    "$home_dir/.config/proxy-client/shell.bash" \
-    "$package_dir/.config/proxy-client/shell.bash"
-  assert_link_points_to \
-    "$home_dir/.config/proxy-client/examples" \
-    "$package_dir/.config/proxy-client/examples"
 }
 
-test_does_not_duplicate_full_dotfiles_shell_setup() {
+home_snapshot() {
-  local fixture_root package_dir home_dir source_count
+  find "$1" -printf '%p %y %l %s %T@\n' | sort
-  fixture_root="$(mktemp -d "$TEST_TMP_ROOT/fixture.XXXXXX")"
-  package_dir="$(setup_package "$fixture_root")"
-  home_dir="$fixture_root/home"
-  mkdir -p "$home_dir"
-  printf '%s\n' \
-    '[ -f ~/.config/proxy-client/shell.bash ] && source ~/.config/proxy-client/shell.bash' \
-    > "$home_dir/.bash_custom"
-  printf '%s\n' '[ -f ~/.bash_custom ] && source ~/.bash_custom' \
-    > "$home_dir/.bashrc"
-
-  run_package_install "$package_dir" "$home_dir" missing-stow >/dev/null
-
-  grep -Fq '# >>> proxy-client >>>' "$home_dir/.bashrc" \
-    || fail "Expected managed PATH block with full dotfiles"
-  grep -Fq 'export PATH="$HOME/.local/bin:$PATH"' "$home_dir/.bashrc" \
-    || fail "Expected ~/.local/bin setup with full dotfiles"
-  source_count="$(grep -Fc 'proxy-client/shell.bash' "$home_dir/.bashrc" || true)"
-  [ "$source_count" -eq 0 ] \
-    || fail "Standalone block duplicated full dotfiles module source"
 }
 
-test_rejects_damaged_managed_bash_block_before_changes() {
+test_fresh_install() {
-  local fixture_root package_dir home_dir output
+  local fixture home_dir package_dir output
-  fixture_root="$(mktemp -d "$TEST_TMP_ROOT/fixture.XXXXXX")"
+  fixture="$(new_fixture)"
-  package_dir="$(setup_package "$fixture_root")"
+  home_dir="$fixture/home"
-  home_dir="$fixture_root/home"
+  package_dir="$fixture/source with spaces/proxy-client"
-  mkdir -p "$home_dir"
-  printf '%s\n' '# >>> proxy-client >>>' > "$home_dir/.bashrc"
 
-  if output="$(
+  run_install "$fixture" >/dev/null
-    run_package_install "$package_dir" "$home_dir" missing-stow 2>&1
+
-  )"; then
+  assert_package_links "$package_dir" "$home_dir"
-    fail "Expected damaged managed Bash block to be rejected"
+  [ -x "$home_dir/.local/bin/proxy-client" ] || fail "CLI не исполняемый"
+  assert_not_exists "$home_dir/.config/proxy-client/config"
+  assert_not_exists "$home_dir/.config/proxy-client/default.url"
+  output="$(
+    env -i HOME="$home_dir" PATH=/usr/bin:/bin TERM=dumb bash -ic '
+      command -v proxy-client && declare -F proxy_on
+    ' 2>/dev/null
+  )"
+  [ "$output" = "$home_dir/.local/bin/proxy-client"$'\n'proxy_on ] \
+    || fail "новый Bash не нашёл proxy-client и proxy_on: $output"
+  ok "свежая установка: три ссылки и рабочий блок в ~/.bashrc"
+}
+
+test_repeat_changes_nothing() {
+  local fixture home_dir before
+  fixture="$(new_fixture)"
+  home_dir="$fixture/home"
+  run_install "$fixture" >/dev/null
+  before="$(home_snapshot "$home_dir")"
+
+  run_install "$fixture" >/dev/null
+
+  [ "$(home_snapshot "$home_dir")" = "$before" ] \
+    || fail "повторный запуск изменил HOME"
+  ok "повторный запуск ничего не меняет"
+}
+
+test_conflicts_block_whole_install() {
+  local fixture home_dir output
+  fixture="$(new_fixture)"
+  home_dir="$fixture/home"
+  mkdir -p "$home_dir/.local/bin" "$home_dir/.config/proxy-client"
+  printf 'KEEP_CLI\n' > "$home_dir/.local/bin/proxy-client"
+  ln -s "$fixture/missing" "$home_dir/.config/proxy-client/examples"
+
+  if output="$(run_install "$fixture" 2>&1)"; then
+    fail "установка прошла поверх чужих файлов"
   fi
 
-  printf '%s' "$output" | grep -Fq "$home_dir/.bashrc" \
+  printf '%s' "$output" | grep -Fq "$home_dir/.local/bin/proxy-client" \
-    || fail "Expected ~/.bashrc conflict in output"
+    || fail "не назван конфликт CLI"
-  [ "$(wc -l < "$home_dir/.bashrc")" -eq 1 ] \
+  printf '%s' "$output" | grep -Fq "$home_dir/.config/proxy-client/examples" \
-    || fail "Expected damaged Bash block to stay unchanged"
+    || fail "не названа битая ссылка"
-  assert_not_exists "$home_dir/.local"
+  grep -Fqx KEEP_CLI "$home_dir/.local/bin/proxy-client" \
-  assert_not_exists "$home_dir/.config"
+    || fail "чужой CLI изменён"
-}
+  [ "$(readlink "$home_dir/.config/proxy-client/examples")" = "$fixture/missing" ] \
-
+    || fail "битая ссылка изменена"
-test_does_not_duplicate_existing_local_bin_path() {
+  assert_not_exists "$home_dir/.config/proxy-client/shell.bash"
-  local fixture_root package_dir home_dir path_count source_count
-  fixture_root="$(mktemp -d "$TEST_TMP_ROOT/fixture.XXXXXX")"
-  package_dir="$(setup_package "$fixture_root")"
-  home_dir="$fixture_root/home"
-  mkdir -p "$home_dir"
-  printf '%s\n' 'export PATH="$HOME/.local/bin:$PATH"' > "$home_dir/.bashrc"
-
-  run_package_install "$package_dir" "$home_dir" missing-stow >/dev/null
-
-  path_count="$(grep -Fc 'export PATH="$HOME/.local/bin:$PATH"' "$home_dir/.bashrc")"
-  source_count="$(grep -Fc 'proxy-client/shell.bash' "$home_dir/.bashrc")"
-  [ "$path_count" -eq 1 ] || fail "Existing ~/.local/bin PATH line was duplicated"
-  [ "$source_count" -eq 1 ] || fail "Expected shell module source in managed block"
-}
-
-test_rejects_incomplete_source_before_changes() {
-  local fixture_root package_dir home_dir output
-  fixture_root="$(mktemp -d "$TEST_TMP_ROOT/fixture.XXXXXX")"
-  package_dir="$(setup_package "$fixture_root")"
-  home_dir="$fixture_root/home"
-  mkdir -p "$home_dir"
-  rm "$package_dir/.config/proxy-client/shell.bash"
-
-  if output="$(
-    run_package_install "$package_dir" "$home_dir" missing-stow 2>&1
-  )"; then
-    fail "Expected incomplete source package to be rejected"
-  fi
-
-  printf '%s' "$output" | grep -Fq 'исходного пакета' \
-    || fail "Expected source package error"
-  assert_not_exists "$home_dir/.local"
-  assert_not_exists "$home_dir/.config"
   assert_not_exists "$home_dir/.bashrc"
+  ok "все конфликты названы сразу, частичной установки нет"
 }
 
-main() {
+test_keeps_machine_files() {
-  test_installs_same_public_artifacts_without_stow
+  local fixture home_dir
-  test_configures_bash_once_by_default
+  fixture="$(new_fixture)"
-  test_installs_same_public_artifacts_with_stow
+  home_dir="$fixture/home"
-  test_rejects_linked_parent_directories_before_changes
+  mkdir -p "$home_dir/.config/proxy-client"
-  test_reports_all_target_conflicts_without_partial_install
+  printf 'HOME_CONFIG\n' > "$home_dir/.config/proxy-client/config"
-  test_rejects_broken_link_without_creating_other_targets
+  printf 'HOME_PROFILE\n' > "$home_dir/.config/proxy-client/default.url"
-  test_preserves_machine_files_with_both_methods
+
-  test_accepts_existing_links_when_method_changes
+  run_install "$fixture" --no-shell-setup >/dev/null
-  test_stow_completes_partial_correct_installation
+
-  test_does_not_duplicate_full_dotfiles_shell_setup
+  [ ! -L "$home_dir/.config/proxy-client/config" ] || fail "config стал ссылкой"
-  test_rejects_damaged_managed_bash_block_before_changes
+  [ ! -L "$home_dir/.config/proxy-client/default.url" ] \
-  test_does_not_duplicate_existing_local_bin_path
+    || fail "default.url стал ссылкой"
-  test_rejects_incomplete_source_before_changes
+  grep -Fqx HOME_CONFIG "$home_dir/.config/proxy-client/config" \
-  echo "All standalone proxy-client install tests passed"
+    || fail "машинный config изменён"
+  grep -Fqx HOME_PROFILE "$home_dir/.config/proxy-client/default.url" \
+    || fail "default.url изменён"
+  ok "машинные config и default.url не трогаются"
 }
 
-main "$@"
+test_no_shell_setup() {
+  local fixture home_dir output
+  fixture="$(new_fixture)"
+  home_dir="$fixture/home"
+
+  output="$(run_install "$fixture" --no-shell-setup)"
+
+  assert_not_exists "$home_dir/.bashrc"
+  printf '%s' "$output" | grep -Fq 'proxy-client/shell.bash' \
+    || fail "нет подсказки для текущей сессии"
+  ok "--no-shell-setup не трогает ~/.bashrc"
+}
+
+test_linked_parent_directories() {
+  local fixture home_dir package_dir
+  fixture="$(new_fixture)"
+  home_dir="$fixture/home"
+  package_dir="$fixture/source with spaces/proxy-client"
+  mkdir -p "$fixture/external-local" "$fixture/external-config"
+  ln -s "$fixture/external-local" "$home_dir/.local"
+  ln -s "$fixture/external-config" "$home_dir/.config"
+
+  run_install "$fixture" --no-shell-setup >/dev/null
+
+  assert_package_links "$package_dir" "$home_dir"
+  [ -L "$fixture/external-local/bin/proxy-client" ] \
+    || fail "ссылка не попала в каталог, на который указывает ~/.local"
+  ok "каталоги ~/.local и ~/.config могут быть ссылками"
+}
+
+test_fresh_install
+test_repeat_changes_nothing
+test_conflicts_block_whole_install
+test_keeps_machine_files
+test_no_shell_setup
+test_linked_parent_directories
+echo "PASS: тесты установщика proxy-client"

tests/test_proxy_launchers.sh

@@ -1,12 +1,19 @@
 #!/usr/bin/env bash
+# Тесты Bash-функций proxy-client: вместо настоящего CLI — поддельный
+# исполняемый файл в PROXY_CLIENT_BIN.
+# Строчные proxy-переменные задаёт proxy_on, shellcheck этого не видит.
+# shellcheck disable=SC2154
 set -euo pipefail
 
 REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 FUNCTIONS_FILE="$REPO_ROOT/bash/.bash_functions"
 CUSTOM_FILE="$REPO_ROOT/bash/.bash_custom"
 SHELL_MODULE="$REPO_ROOT/proxy-client/.config/proxy-client/shell.bash"
+TEST_ROOT="$(mktemp -d /tmp/proxy-launchers-test.XXXXXX)"
+trap 'rm -rf "$TEST_ROOT"' EXIT
 
-pass_count=0
+PROXY_KEYS=(HTTP_PROXY HTTPS_PROXY ALL_PROXY NO_PROXY
+            http_proxy https_proxy all_proxy no_proxy)
 
 fail() {
   echo "FAIL: $*" >&2
@@ -14,177 +21,124 @@ fail() {
 }
 
 ok() {
-  pass_count=$((pass_count + 1))
   echo "ok - $*"
 }
 
 assert_eq() {
-  local expected="$1" actual="$2" message="$3"
+  [ "$1" = "$2" ] || fail "$3 (ожидалось '$1', получено '$2')"
-  [ "$expected" = "$actual" ] || fail "$message (ожидалось '$expected', получено '$actual')"
 }
 
-valid_env() {
+# Поддельный CLI: на "env" печатает $FAKE_ENV_OUTPUT, на остальное — свои
-  cat <<'EOF'
+# аргументы по одному в строке; завершается с кодом $FAKE_RC.
-HTTP_PROXY=http://proxy.test:1234
+PROXY_CLIENT_BIN="$TEST_ROOT/proxy-client"
+cat > "$PROXY_CLIENT_BIN" <<'EOF'
+#!/usr/bin/env bash
+if [ "$1" = env ]; then
+  printf '%s\n' "$FAKE_ENV_OUTPUT"
+else
+  printf '<%s>\n' "$@"
+fi
+exit "${FAKE_RC:-0}"
+EOF
+chmod +x "$PROXY_CLIENT_BIN"
+export PROXY_CLIENT_BIN
+
+VALID_ENV='HTTP_PROXY=http://proxy.test:1234
 HTTPS_PROXY=http://proxy.test:1234
 ALL_PROXY=socks5://proxy.test:1234
-NO_PROXY=proxy.test,localhost,127.0.0.1,::1,[::1],.example.test
+NO_PROXY=proxy.test,localhost,.example.test
 http_proxy=http://proxy.test:1234
 https_proxy=http://proxy.test:1234
 all_proxy=socks5://proxy.test:1234
-no_proxy=proxy.test,localhost,127.0.0.1,::1,[::1],.example.test
+no_proxy=proxy.test,localhost,.example.test'
-EOF
-}
 
-assert_five_proxy_commands() {
+# shellcheck source=/dev/null
-  local command_name
+source "$SHELL_MODULE"
-  for command_name in proxy_on proxy_off pclaude pcodex myip; do
+
-    declare -F "$command_name" >/dev/null || fail "нет функции $command_name"
+# proxy_on применяет все восемь переменных.
+(
+  unset "${PROXY_KEYS[@]}"
+  FAKE_ENV_OUTPUT="$VALID_ENV" proxy_on >/dev/null
+  assert_eq http://proxy.test:1234 "$HTTP_PROXY" HTTP_PROXY
+  assert_eq http://proxy.test:1234 "$https_proxy" https_proxy
+  assert_eq socks5://proxy.test:1234 "$ALL_PROXY" ALL_PROXY
+  assert_eq proxy.test,localhost,.example.test "$no_proxy" no_proxy
+  for key in "${PROXY_KEYS[@]}"; do
+    [ -n "$(printenv "$key")" ] || fail "$key не экспортирован"
   done
-}
+)
+ok "proxy_on применяет восемь переменных"
 
-# Самостоятельный модуль предоставляет весь публичный Bash-интерфейс.
+# Ошибка CLI или непонятный вывод не меняют окружение ни на одну переменную.
+for case_spec in "1|$VALID_ENV" "0|$VALID_ENV
+EXTRA_PROXY=bad" "0|BROKEN-LINE"; do
   (
-  source "$SHELL_MODULE"
+    for key in "${PROXY_KEYS[@]}"; do export "$key=old"; done
-  assert_five_proxy_commands
+    if FAKE_RC="${case_spec%%|*}" FAKE_ENV_OUTPUT="${case_spec#*|}" \
-) && ok "самостоятельное подключение предоставляет пять proxy-команд"
+        proxy_on >/dev/null 2>&1; then
-
+      fail "proxy_on принял ошибочный ответ: ${case_spec#*|}"
-# Обычная .bash_custom независимо подключает общие функции и proxy-модуль.
-(
-  fixture="$(mktemp -d /tmp/proxy-bash-custom-test.XXXXXX)"
-  mkdir -p "$fixture/.config/proxy-client"
-  ln -s "$CUSTOM_FILE" "$fixture/.bash_custom"
-  ln -s "$FUNCTIONS_FILE" "$fixture/.bash_functions"
-  ln -s "$SHELL_MODULE" "$fixture/.config/proxy-client/shell.bash"
-  output="$(
-    HOME="$fixture" bash --noprofile --norc -ic '
-      source "$HOME/.bash_custom"
-      for name in proxy_on proxy_off pclaude pcodex myip update_hproxy; do
-        declare -F "$name" >/dev/null || exit 1
-      done
-      printf ready
-    ' 2>/dev/null
-  )"
-  assert_eq ready "$output" ".bash_custom не подключил оба независимых модуля"
-) && ok "обычное подключение предоставляет proxy-команды и update_hproxy"
-
-# proxy_on применяет восемь известных переменных и не запрашивает IP.
-(
-  source "$SHELL_MODULE"
-  _proxy_cli() {
-    [ "$1" = env ] || return 99
-    valid_env
-  }
-  curl() { fail "proxy_on не должен вызывать curl"; }
-  unset HTTP_PROXY HTTPS_PROXY ALL_PROXY NO_PROXY \
-        http_proxy https_proxy all_proxy no_proxy || true
-  proxy_on >/dev/null
-  assert_eq "http://proxy.test:1234" "$HTTP_PROXY" "HTTP_PROXY"
-  assert_eq "$HTTP_PROXY" "$http_proxy" "http_proxy"
-  assert_eq "http://proxy.test:1234" "$HTTPS_PROXY" "HTTPS_PROXY"
-  assert_eq "$HTTPS_PROXY" "$https_proxy" "https_proxy"
-  assert_eq "socks5://proxy.test:1234" "$ALL_PROXY" "ALL_PROXY"
-  assert_eq "$ALL_PROXY" "$all_proxy" "all_proxy"
-  assert_eq "proxy.test,localhost,127.0.0.1,::1,[::1],.example.test" "$NO_PROXY" "NO_PROXY"
-  assert_eq "$NO_PROXY" "$no_proxy" "no_proxy"
-) && ok "proxy_on применяет известные ключи без запроса IP"
-
-# Неизвестная строка в машинном выводе оставляет прежнее окружение целиком.
-unknown_output="$(valid_env; printf 'EXTRA_PROXY=bad\n')"
-for bad_output in \
-  "$unknown_output" \
-  "BROKEN-LINE"; do
-  (
-    source "$SHELL_MODULE"
-    export HTTP_PROXY=old-http HTTPS_PROXY=old-https ALL_PROXY=old-all NO_PROXY=old-no
-    export http_proxy=old-http-lower https_proxy=old-https-lower
-    export all_proxy=old-all-lower no_proxy=old-no-lower
-    _proxy_cli() { printf '%s\n' "$bad_output"; }
-    if proxy_on >/dev/null 2>&1; then
-      fail "proxy_on принял неверный вывод"
     fi
-    assert_eq old-http "$HTTP_PROXY" "HTTP_PROXY изменился при ошибке"
+    for key in "${PROXY_KEYS[@]}"; do
-    assert_eq old-https "$HTTPS_PROXY" "HTTPS_PROXY изменился при ошибке"
+      assert_eq old "${!key}" "$key изменился после ошибки"
-    assert_eq old-all "$ALL_PROXY" "ALL_PROXY изменился при ошибке"
-    assert_eq old-no "$NO_PROXY" "NO_PROXY изменился при ошибке"
-    assert_eq old-http-lower "$http_proxy" "http_proxy изменился при ошибке"
-    assert_eq old-https-lower "$https_proxy" "https_proxy изменился при ошибке"
-    assert_eq old-all-lower "$all_proxy" "all_proxy изменился при ошибке"
-    assert_eq old-no-lower "$no_proxy" "no_proxy изменился при ошибке"
-  ) || fail "атомарность нарушена для неверного вывода"
     done
-ok "неизвестная env-строка отклоняется без частичного изменения окружения"
+  )
+done
+ok "неуспешный env не меняет окружение"
 
-# Даже полный stdout не применяется, если CLI завершился с ошибкой.
+# proxy_off очищает оба регистра.
 (
-  source "$SHELL_MODULE"
+  for key in "${PROXY_KEYS[@]}"; do export "$key=x"; done
-  export HTTP_PROXY=old HTTPS_PROXY=old ALL_PROXY=old NO_PROXY=old
+  proxy_off >/dev/null
-  export http_proxy=old https_proxy=old all_proxy=old no_proxy=old
+  for key in "${PROXY_KEYS[@]}"; do
-  _proxy_cli() {
+    [ -z "${!key+set}" ] || fail "$key не очищен"
-    valid_env
-    return 1
-  }
-  if proxy_on >/dev/null 2>&1; then
-    fail "proxy_on принял вывод неуспешного CLI"
-  fi
-  for key in HTTP_PROXY HTTPS_PROXY ALL_PROXY NO_PROXY \
-             http_proxy https_proxy all_proxy no_proxy; do
-    assert_eq old "${!key}" "$key изменился после ошибки CLI"
   done
-) && ok "stdout неуспешного env не изменяет окружение"
+)
+ok "proxy_off очищает восемь переменных"
 
 # Обёртки передают CLI команду, аргументы и код возврата без искажений.
 (
-  source "$SHELL_MODULE"
+  export FAKE_RC=42
-  _proxy_cli() {
-    printf '<%s>\n' "$@"
-    return 42
-  }
   set +e
   output="$(pclaude "a b" -- --flag)"
   rc=$?
   set -e
   assert_eq 42 "$rc" "pclaude не сохранил код возврата"
-  assert_eq $'<run>\n<-->\n<claude>\n<a b>\n<-->\n<--flag>' "$output" "pclaude исказил аргументы"
+  assert_eq $'<run>\n<-->\n<claude>\n<a b>\n<-->\n<--flag>' "$output" \
+    "pclaude исказил аргументы"
 
   set +e
   output="$(pcodex --search)"
   rc=$?
   set -e
   assert_eq 42 "$rc" "pcodex не сохранил код возврата"
-  assert_eq $'<run>\n<-->\n<codex>\n<--search>' "$output" "pcodex исказил аргументы"
+  assert_eq $'<run>\n<-->\n<codex>\n<--search>' "$output" \
-) && ok "pclaude и pcodex делегируют run и сохраняют аргументы/код"
+    "pcodex исказил аргументы"
+)
+ok "pclaude и pcodex передают аргументы и код выхода"
 
-# proxy_off очищает оба регистра и не смешивает действие с диагностикой.
+# .bash_custom подключает и общие функции, и proxy-модуль.
 (
-  source "$SHELL_MODULE"
+  home="$TEST_ROOT/home"
-  export HTTP_PROXY=x HTTPS_PROXY=x ALL_PROXY=x NO_PROXY=x
+  mkdir -p "$home/.config/proxy-client"
-  export http_proxy=x https_proxy=x all_proxy=x no_proxy=x
+  ln -s "$CUSTOM_FILE" "$home/.bash_custom"
-  curl() { fail "proxy_off не должен вызывать curl"; }
+  ln -s "$FUNCTIONS_FILE" "$home/.bash_functions"
-  proxy_off >/dev/null
+  ln -s "$SHELL_MODULE" "$home/.config/proxy-client/shell.bash"
-  for key in HTTP_PROXY HTTPS_PROXY ALL_PROXY NO_PROXY \
+  output="$(
-             http_proxy https_proxy all_proxy no_proxy; do
+    HOME="$home" bash --noprofile --norc -ic '
-    [ -z "${!key+x}" ] || fail "$key не очищен"
+      source "$HOME/.bash_custom"
-  done
+      declare -F proxy_on update_hproxy >/dev/null && printf ready
-) && ok "proxy_off очищает восемь переменных без запроса IP"
+    ' 2>/dev/null
-
+  )"
-# Общий файл больше не владеет proxy-интерфейсом, но сохраняет update_hproxy.
+  assert_eq ready "$output" ".bash_custom не подключил модули"
-(
+)
-  source "$FUNCTIONS_FILE"
+ok ".bash_custom подключает общие функции и proxy-модуль"
-  declare -F update_hproxy >/dev/null || fail "update_hproxy потерян"
-  for name in proxy_on proxy_off pclaude pcodex myip _proxy_run _proxy_cli; do
-    if declare -F "$name" >/dev/null; then
-      fail "$name всё ещё определён в bash/.bash_functions"
-    fi
-  done
-) && ok "владение proxy-функциями перенесено, update_hproxy сохранён"
 
 if command -v shellcheck >/dev/null 2>&1; then
-  shellcheck -s bash "$FUNCTIONS_FILE" "$CUSTOM_FILE" "$SHELL_MODULE" "$0" \
+  shellcheck -s bash "$SHELL_MODULE" "$0" \
     || fail "shellcheck нашёл проблемы"
   ok "shellcheck чист"
 else
   echo "skip - shellcheck не установлен"
 fi
 
-echo "PASS: $pass_count проверок пройдено"
+echo "PASS: тесты Bash-функций proxy-client"