# Conflicts: # apps/desktop/e2e/archived-hidden-session-recoverable.spec.ts # apps/desktop/e2e/bot-chat-message-agent-friendly-name.spec.ts # apps/desktop/e2e/bot-mailbox-unreadable-ticket.spec.ts # apps/desktop/e2e/bot-mode-roster-localized.spec.ts # apps/desktop/e2e/bot-mode-row-click-mirrors-registry.spec.ts # apps/desktop/e2e/bot-mode-tab-shows-bot-name.spec.ts # apps/desktop/e2e/bot-roster-group-row-organisation.spec.ts # apps/desktop/e2e/bot-roster-ignores-infra-dirs.spec.ts # apps/desktop/e2e/bot-roster-timestamp-meta.spec.ts # apps/desktop/e2e/bot-roster-user-sections.spec.ts # apps/desktop/e2e/bot-routines-pane-narrow.spec.ts # apps/desktop/e2e/bot-row-open-recent-session.spec.ts # apps/desktop/e2e/bot-tile-ignores-ambient-composer-model.spec.ts # apps/desktop/e2e/group-composer-auto-grow.spec.ts # apps/desktop/e2e/group-create-gate-remote-roster.spec.ts # apps/desktop/e2e/group-prompt-renamed-primary-handle.spec.ts # apps/desktop/e2e/hosted-room-backend-continuity.spec.ts # apps/desktop/e2e/hosted-room-legacy-store-migration.spec.ts # apps/desktop/e2e/settings-scope-chips-bot-title.spec.ts # apps/desktop/e2e/worktree-branch-status.spec.ts # apps/desktop/electron/backend-probes.test.ts # apps/desktop/electron/connection-apply.test.ts # apps/desktop/electron/desktop-electron-pin.test.ts # apps/desktop/electron/desktop-uninstall.test.ts # apps/desktop/electron/gateway-file-download-transport.test.ts # apps/desktop/electron/gateway-stop-before-update.test.ts # apps/desktop/electron/github-api-auth.test.ts # apps/desktop/electron/registry-primary-profile-scope.test.ts # apps/desktop/electron/update-api-check.test.ts # apps/desktop/electron/update-handoff-marker.test.ts # apps/desktop/electron/venv-blocker-scan.test.ts # apps/desktop/scripts/after-extract.test.mjs # apps/desktop/scripts/local-pack-publish.test.mjs # apps/desktop/scripts/tasks-scroll.test.mjs # apps/desktop/src/app/settings/model-settings.test.tsx # apps/desktop/src/app/updates-overlay.blockers.test.tsx # apps/desktop/src/components/desktop-install-overlay.test.tsx # apps/desktop/src/lib/update-copy.test.ts # scripts/ci/check_os_marker_fakes.py # tests-js/desktop-mac-usage-descriptions.test.ts # tests-js/node-engine-alignment.test.ts # tests/agent/lsp/test_install_and_lint_fixes.py # tests/agent/test_command_token_source.py # tests/agent/test_compression_boundary_hook.py # tests/agent/test_create_openai_client_ssl_verify.py # tests/agent/test_custom_provider_ca_probes.py # tests/agent/test_endpoint_blackhole.py # tests/agent/test_estimator_parity.py # tests/agent/test_in_place_compaction.py # tests/agent/test_moa_loop_mode.py # tests/agent/test_model_metadata.py # tests/agent/test_skill_session_platform_gate.py # tests/agent/test_skill_utils.py # tests/agent/test_ssl_ca_guard.py # tests/computer_use/test_doctor.py # tests/cron/test_codex_execution_paths.py # tests/cron/test_cron_bot_chat_delivery.py # tests/cron/test_cron_script.py # tests/cron/test_media_delivery_parity.py # tests/cron/test_misfire_catchup.py # tests/cron/test_parallel_pool.py # tests/cron/test_recurring_eagain_redispatch.py # tests/gateway/test_choice_picker.py # tests/gateway/test_control_socket_windows_live.py # tests/gateway/test_dingtalk.py # tests/gateway/test_feishu.py # tests/gateway/test_feishu_onboard.py # tests/gateway/test_gateway_shutdown.py # tests/gateway/test_matrix.py # tests/gateway/test_model_command_custom_providers.py # tests/gateway/test_reasoning_command.py # tests/gateway/test_runtime_footer.py # tests/gateway/test_session.py # tests/gateway/test_session_hygiene.py # tests/gateway/test_status.py # tests/gateway/test_teams.py # tests/gateway/test_turn_lease.py # tests/gateway/test_whatsapp_connect.py # tests/hermes_cli/test_approvals_command.py # tests/hermes_cli/test_auth_store_lock_concurrent.py # tests/hermes_cli/test_backup.py # tests/hermes_cli/test_banner_git_state.py # tests/hermes_cli/test_certifi_repair.py # tests/hermes_cli/test_cmd_update.py # tests/hermes_cli/test_compat_manifest_targets.py # tests/hermes_cli/test_computer_use_cli.py # tests/hermes_cli/test_cpr_local_leak.py # tests/hermes_cli/test_dashboard_auth_gate.py # tests/hermes_cli/test_dashboard_procs_kill_grace.py # tests/hermes_cli/test_desktop_lifecycle_windows_live.py # tests/hermes_cli/test_doctor.py # tests/hermes_cli/test_doctor_command_install.py # tests/hermes_cli/test_fleet_config_migration_windows_live.py # tests/hermes_cli/test_gateway.py # tests/hermes_cli/test_gateway_platform_gating.py # tests/hermes_cli/test_gateway_restart_loop.py # tests/hermes_cli/test_gateway_task_probe.py # tests/hermes_cli/test_gateway_wsl.py # tests/hermes_cli/test_gui_command.py # tests/hermes_cli/test_install_cua_driver.py # tests/hermes_cli/test_kanban_db.py # tests/hermes_cli/test_lazy_command_exports.py # tests/hermes_cli/test_lazy_refresh_venv_repair.py # tests/hermes_cli/test_linux_desktop_entry.py # tests/hermes_cli/test_local_runtime.py # tests/hermes_cli/test_local_runtime_updates.py # tests/hermes_cli/test_managed_uv.py # tests/hermes_cli/test_mcp_reload_confirm_gate.py # tests/hermes_cli/test_nous_subscription.py # tests/hermes_cli/test_npm_engine.py # tests/hermes_cli/test_personality_none.py # tests/hermes_cli/test_pet_toggle.py # tests/hermes_cli/test_plan_reconciliation_windows_live.py # tests/hermes_cli/test_plugin_event_bus.py # tests/hermes_cli/test_plugin_manifest_v2.py # tests/hermes_cli/test_plugin_packs.py # tests/hermes_cli/test_plugins_cmd.py # tests/hermes_cli/test_plugins_cmd_enable_disable_nested.py # tests/hermes_cli/test_process_identity.py # tests/hermes_cli/test_profiles.py # tests/hermes_cli/test_profiles_sidebar_cache.py # tests/hermes_cli/test_pty_bridge.py # tests/hermes_cli/test_resolve_turn_limit.py # tests/hermes_cli/test_serve_runtime_inventory.py # tests/hermes_cli/test_session_vacuum_config.py # tests/hermes_cli/test_set_config_value.py # tests/hermes_cli/test_signal_handler_kanban_worker.py # tests/hermes_cli/test_slash_confirm_windows.py # tests/hermes_cli/test_stale_pid_guard.py # tests/hermes_cli/test_startup_fast_guards.py # tests/hermes_cli/test_status.py # tests/hermes_cli/test_telegram_managed_bot.py # tests/hermes_cli/test_tools_config.py # tests/hermes_cli/test_update_apply_shallow_count.py # tests/hermes_cli/test_update_autostash.py # tests/hermes_cli/test_update_concurrent_quarantine.py # tests/hermes_cli/test_update_fetch_failure_classifier.py # tests/hermes_cli/test_update_fleet_probe_resume_token.py # tests/hermes_cli/test_update_handoff_backend_reap.py # tests/hermes_cli/test_update_handoff_desktop_rebuild.py # tests/hermes_cli/test_update_head_moved_gate.py # tests/hermes_cli/test_update_host_obligation.py # tests/hermes_cli/test_update_import_guard.py # tests/hermes_cli/test_update_interrupted_recovery.py # tests/hermes_cli/test_update_inventory.py # tests/hermes_cli/test_update_launchd_unloaded_gateway.py # tests/hermes_cli/test_update_missing_configured_deps.py # tests/hermes_cli/test_update_modified_notice.py # tests/hermes_cli/test_update_multiplex_migration_hook.py # tests/hermes_cli/test_update_no_gateway_restart.py # tests/hermes_cli/test_update_orphan_backend_reap.py # tests/hermes_cli/test_update_parked_branch_guard.py # tests/hermes_cli/test_update_post_pull_syntax_guard.py # tests/hermes_cli/test_update_receipt.py # tests/hermes_cli/test_update_self_lock.py # tests/hermes_cli/test_update_shim_fail_closed.py # tests/hermes_cli/test_update_shim_self_lock.py # tests/hermes_cli/test_update_sqlite_remediation.py # tests/hermes_cli/test_update_stale_dashboard.py # tests/hermes_cli/test_update_stale_virtualenv.py # tests/hermes_cli/test_update_venv_health.py # tests/hermes_cli/test_update_venv_ownership_preflight.py # tests/hermes_cli/test_update_wedged_gateway.py # tests/hermes_cli/test_update_yes_flag.py # tests/hermes_cli/test_update_zip_two_phase.py # tests/hermes_cli/test_urllib_security.py # tests/hermes_cli/test_ux_messages_auth_config.py # tests/hermes_cli/test_ux_messages_startup.py # tests/hermes_cli/test_venv_holder_classifier.py # tests/hermes_cli/test_verify_console_scripts.py # tests/hermes_cli/test_verify_core_dependencies.py # tests/hermes_cli/test_web_server.py # tests/hermes_cli/test_web_server_console_ws.py # tests/hermes_cli/test_web_server_ws_ping.py # tests/hermes_cli/test_web_ui_build.py # tests/hermes_state/test_fts_rebuild_admission.py # tests/hermes_state/test_hermes_state.py # tests/plugins/memory/test_memory_lazy_install.py # tests/plugins/test_google_meet_plugin.py # tests/plugins/test_langfuse_plugin.py # tests/plugins/test_security_guidance_plugin.py # tests/plugins/test_transform_llm_output_hook.py # tests/scripts/desktop_update/test_desktop_update_windows_gateway_flag.py # tests/scripts/desktop_update/test_desktop_update_windows_python_handoff.py # tests/scripts/desktop_update/test_desktop_update_windows_timestamp.py # tests/scripts/install/test_install_clone_throttle_fallback.py # tests/scripts/install/test_install_lockfile_churn.py # tests/scripts/install/test_install_no_initial_commit.py # tests/scripts/install/test_install_sh_browser_install.py # tests/scripts/install/test_install_sh_node_prerelease.py # tests/scripts/install/test_install_sh_symlink_stomp.py # tests/scripts/install/test_install_sh_uv_lock_config.py # tests/scripts/install/test_install_unmerged_index.py # tests/scripts/test_contributor_map.py # tests/scripts/test_run_tests_parallel.py # tests/skills/test_competitor_news_monitor_skill.py # tests/skills/test_document_to_action_items_skill.py # tests/skills/test_google_workspace_setup.py # tests/skills/test_google_workspace_setup_deps.py # tests/skills/test_grounded_citations_skill.py # tests/skills/test_ip_as_logo_skill.py # tests/skills/test_live_dashboard_skill.py # tests/skills/test_mcp_oauth_remote_gateway_skill.py # tests/skills/test_office_document_skills.py # tests/skills/test_openclaw_migration.py # tests/skills/test_product_price_monitor_skill.py # tests/skills/test_scrollcraft_skill.py # tests/skills/test_setup_wizard_generator_skill.py # tests/skills/test_weekly_review_planning_skill.py # tests/test_engines_satisfiable.py # tests/test_fast_safe_load.py # tests/test_hermes_bootstrap.py # tests/test_hermes_constants.py # tests/test_hermes_logging.py # tests/test_managed_runtime_resolution.py # tests/test_model_tools_async_bridge.py # tests/test_packaging_build_guard.py # tests/test_packaging_metadata.py # tests/test_yaml_indent_consistency.py # tests/tools/test_approval_timeout_overflow.py # tests/tools/test_base_environment.py # tests/tools/test_bot_mode_dm.py # tests/tools/test_browser_chromium_check.py # tests/tools/test_browser_hardening.py # tests/tools/test_browser_homebrew_paths.py # tests/tools/test_browser_npx_warmup.py # tests/tools/test_browser_orphan_reaper.py # tests/tools/test_browser_real_profile.py # tests/tools/test_browser_use_cli.py # tests/tools/test_clipboard.py # tests/tools/test_code_execution.py # tests/tools/test_code_execution_modes.py # tests/tools/test_code_execution_windows_env.py # tests/tools/test_computer_use.py # tests/tools/test_delegate_liveness_timeout.py # tests/tools/test_execute_code_approval_cluster.py # tests/tools/test_execution_flag_detection.py # tests/tools/test_fal_common.py # tests/tools/test_file_operations.py # tests/tools/test_file_tools.py # tests/tools/test_file_tools_cwd_resolution.py # tests/tools/test_file_tools_live.py # tests/tools/test_lazy_deps.py # tests/tools/test_lazy_deps_durable_target.py # tests/tools/test_lazy_deps_managed.py # tests/tools/test_local_env_blocklist.py # tests/tools/test_local_tempdir.py # tests/tools/test_macos_protected_search.py # tests/tools/test_mcp_npx_cached_bin.py # tests/tools/test_oneshot_completion_linger.py # tests/tools/test_process_registry.py # tests/tools/test_read_file_schema_gating.py # tests/tools/test_skill_improvements.py # tests/tools/test_skills_sync.py # tests/tools/test_termux_api_detection.py # tests/tools/test_tirith_security.py # tests/tools/test_transcription_tools.py # tests/tools/test_tts_streaming.py # tests/tools/test_wake_word.py # tests/tui_gateway/test_compute_host_borrowed_lease.py # tests/tui_gateway/test_compute_host_turn_protocol.py # tests/tui_gateway/test_isolated_orphan_activity.py # tests/tui_gateway/test_protocol.py # tests/tui_gateway/test_slash_worker_profile_home.py # tests/tui_gateway/test_subprocess_encoding.py # tests/tui_gateway/test_tui_gateway_server.py # ui-tui/src/__tests__/terminalParity.test.ts # ui-tui/src/__tests__/termuxComposerLayout.test.ts # ui-tui/src/__tests__/textInputFastEcho.test.ts
431 lines
17 KiB
Python
431 lines
17 KiB
Python
"""Tests for the light-mode terminal detection + color remap in cli.py.
|
|
|
|
Covers the env-override path and the SkinConfig.get_color() wrapper that
|
|
the resize / light-mode salvage installs at module import time. We don't
|
|
try to fake an OSC 11 reply — the env-override branch short-circuits
|
|
before the terminal query, which is the path most users hit.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
|
|
import pytest
|
|
|
|
|
|
@pytest.fixture
|
|
def cli_mod(monkeypatch):
|
|
"""Import cli with the light-mode cache cleared each test."""
|
|
import cli as _cli
|
|
|
|
# The module-level _install_skin_light_mode_hook() and import-time
|
|
# _detect_light_mode() prime ran once at first import. We just reset
|
|
# the detection cache so the per-test env override takes effect.
|
|
monkeypatch.setattr(_cli, "_LIGHT_MODE_CACHE", None)
|
|
return _cli
|
|
|
|
|
|
class TestLightModeDetection:
|
|
def test_hermes_light_env_true_forces_light(self, cli_mod, monkeypatch):
|
|
monkeypatch.setenv("HERMES_LIGHT", "1")
|
|
assert cli_mod._detect_light_mode() is True
|
|
|
|
def test_hermes_light_env_false_forces_dark(self, cli_mod, monkeypatch):
|
|
monkeypatch.setenv("HERMES_LIGHT", "0")
|
|
# Also blank out other signals so nothing else flips it light.
|
|
monkeypatch.delenv("HERMES_TUI_LIGHT", raising=False)
|
|
monkeypatch.delenv("HERMES_TUI_THEME", raising=False)
|
|
monkeypatch.delenv("HERMES_TUI_BACKGROUND", raising=False)
|
|
monkeypatch.delenv("COLORFGBG", raising=False)
|
|
assert cli_mod._detect_light_mode() is False
|
|
|
|
def test_theme_hint_light(self, cli_mod, monkeypatch):
|
|
monkeypatch.delenv("HERMES_LIGHT", raising=False)
|
|
monkeypatch.delenv("HERMES_TUI_LIGHT", raising=False)
|
|
monkeypatch.setenv("HERMES_TUI_THEME", "light")
|
|
assert cli_mod._detect_light_mode() is True
|
|
|
|
def test_background_hex_hint_light(self, cli_mod, monkeypatch):
|
|
monkeypatch.delenv("HERMES_LIGHT", raising=False)
|
|
monkeypatch.delenv("HERMES_TUI_LIGHT", raising=False)
|
|
monkeypatch.delenv("HERMES_TUI_THEME", raising=False)
|
|
monkeypatch.setenv("HERMES_TUI_BACKGROUND", "#FFFFFF")
|
|
assert cli_mod._detect_light_mode() is True
|
|
|
|
def test_background_hex_hint_dark(self, cli_mod, monkeypatch):
|
|
monkeypatch.delenv("HERMES_LIGHT", raising=False)
|
|
monkeypatch.delenv("HERMES_TUI_LIGHT", raising=False)
|
|
monkeypatch.delenv("HERMES_TUI_THEME", raising=False)
|
|
monkeypatch.setenv("HERMES_TUI_BACKGROUND", "#1a1a2e")
|
|
monkeypatch.delenv("COLORFGBG", raising=False)
|
|
assert cli_mod._detect_light_mode() is False
|
|
|
|
def test_colorfgbg_light_bg_slot(self, cli_mod, monkeypatch):
|
|
monkeypatch.delenv("HERMES_LIGHT", raising=False)
|
|
monkeypatch.delenv("HERMES_TUI_LIGHT", raising=False)
|
|
monkeypatch.delenv("HERMES_TUI_THEME", raising=False)
|
|
monkeypatch.delenv("HERMES_TUI_BACKGROUND", raising=False)
|
|
monkeypatch.setenv("COLORFGBG", "0;15") # bg slot 15 = light
|
|
assert cli_mod._detect_light_mode() is True
|
|
|
|
def test_cache_is_sticky(self, cli_mod, monkeypatch):
|
|
monkeypatch.setenv("HERMES_LIGHT", "1")
|
|
assert cli_mod._detect_light_mode() is True
|
|
# Even if the env flips, the cached result wins until reset.
|
|
monkeypatch.setenv("HERMES_LIGHT", "0")
|
|
assert cli_mod._detect_light_mode() is True
|
|
|
|
|
|
class TestOsc11Probe:
|
|
"""The OSC 11 background probe must never run where its reply can leak
|
|
into prompt_toolkit's input (a late BEL-terminated reply reads as Ctrl+G
|
|
= open-editor, trapping the user in a stray editor). Guard the cases we
|
|
refuse to probe in.
|
|
"""
|
|
|
|
@pytest.mark.parametrize("var", ("SSH_CONNECTION", "SSH_CLIENT", "SSH_TTY"))
|
|
def test_skips_over_ssh(self, cli_mod, monkeypatch, var):
|
|
monkeypatch.setattr(cli_mod.sys.stdin, "isatty", lambda: True, raising=False)
|
|
monkeypatch.setattr(cli_mod.sys.stdout, "isatty", lambda: True, raising=False)
|
|
for v in ("SSH_CONNECTION", "SSH_CLIENT", "SSH_TTY"):
|
|
monkeypatch.delenv(v, raising=False)
|
|
monkeypatch.setenv(var, "1.2.3.4 5555 22")
|
|
assert cli_mod._query_osc11_background() is None
|
|
|
|
def test_skips_when_not_a_tty(self, cli_mod, monkeypatch):
|
|
monkeypatch.setattr(cli_mod.sys.stdin, "isatty", lambda: False, raising=False)
|
|
assert cli_mod._query_osc11_background() is None
|
|
|
|
|
|
class TestLightModeRemap:
|
|
def test_remap_no_op_in_dark_mode(self, cli_mod, monkeypatch):
|
|
monkeypatch.setenv("HERMES_LIGHT", "0")
|
|
# Cache is None from the fixture; first call sticks at False.
|
|
assert cli_mod._maybe_remap_for_light_mode("#FFF8DC") == "#FFF8DC"
|
|
|
|
def test_remap_known_dark_color(self, cli_mod, monkeypatch):
|
|
monkeypatch.setenv("HERMES_LIGHT", "1")
|
|
# Force the detect cache to True for this test.
|
|
cli_mod._LIGHT_MODE_CACHE = True
|
|
assert cli_mod._maybe_remap_for_light_mode("#FFF8DC") == "#1A1A1A"
|
|
assert cli_mod._maybe_remap_for_light_mode("#FFD700") == "#9A6B00"
|
|
|
|
def test_remap_case_insensitive(self, cli_mod, monkeypatch):
|
|
cli_mod._LIGHT_MODE_CACHE = True
|
|
# Lowercase input should still remap.
|
|
assert cli_mod._maybe_remap_for_light_mode("#fff8dc") == "#1A1A1A"
|
|
|
|
def test_remap_unknown_color_passthrough(self, cli_mod, monkeypatch):
|
|
cli_mod._LIGHT_MODE_CACHE = True
|
|
# A color not in the remap table is returned unchanged.
|
|
assert cli_mod._maybe_remap_for_light_mode("#ABCDEF") == "#ABCDEF"
|
|
|
|
def test_remap_skips_statusbar_paired_colors(self, cli_mod, monkeypatch):
|
|
"""Colors that live on a dark bg (status bar fg) MUST NOT be
|
|
remapped — otherwise they go dark-on-dark and disappear.
|
|
|
|
Regression guard for the patch-11 fix (intentional table omission).
|
|
"""
|
|
cli_mod._LIGHT_MODE_CACHE = True
|
|
for fg in ("#C0C0C0", "#888888", "#555555", "#8B8682"):
|
|
assert cli_mod._maybe_remap_for_light_mode(fg) == fg, (
|
|
f"{fg} is a status-bar fg paired with dark bg; remapping it "
|
|
"would produce dark-on-dark"
|
|
)
|
|
|
|
|
|
class TestSkinConfigHook:
|
|
"""Exercise the installed color hook, including self-painted badge colors."""
|
|
|
|
@pytest.mark.parametrize("skin_name", ["default", "sisyphus"])
|
|
def test_badge_preserves_its_paired_colors_in_light_mode(
|
|
self, cli_mod, monkeypatch, skin_name
|
|
):
|
|
from hermes_cli.skin_engine import (
|
|
get_active_skin, get_prompt_toolkit_style_overrides, set_active_skin,
|
|
)
|
|
|
|
monkeypatch.setenv("HERMES_LIGHT", "1")
|
|
previous = get_active_skin().name
|
|
try:
|
|
set_active_skin(skin_name)
|
|
skin = get_active_skin()
|
|
background = skin.colors.get("status_bar_strong", skin.colors.get("banner_title", "#FFD700"))
|
|
foreground = skin.colors.get("status_bar_bg", "#1a1a2e")
|
|
assert get_prompt_toolkit_style_overrides()["status-bar-session-title"] == (
|
|
f"bg:{background} {foreground} bold"
|
|
)
|
|
finally:
|
|
set_active_skin(previous)
|
|
|
|
|
|
|
|
def test_hook_is_idempotent(self, cli_mod):
|
|
# Calling the installer twice must not double-wrap (the marker
|
|
# attribute is the guard).
|
|
from hermes_cli.skin_engine import SkinConfig
|
|
|
|
before = SkinConfig.get_color
|
|
cli_mod._install_skin_light_mode_hook()
|
|
after = SkinConfig.get_color
|
|
assert before is after
|
|
|
|
def test_skin_color_remaps_through_wrapper_in_light_mode(
|
|
self, cli_mod, monkeypatch
|
|
):
|
|
from hermes_cli.skin_engine import SkinConfig
|
|
|
|
cli_mod._LIGHT_MODE_CACHE = True
|
|
skin = SkinConfig(
|
|
name="test",
|
|
colors={"banner_text": "#FFF8DC", "response_border": "#FFD700"},
|
|
)
|
|
# The wrapper kicks in at get_color, not at construction time.
|
|
assert skin.get_color("banner_text") == "#1A1A1A"
|
|
assert skin.get_color("response_border") == "#9A6B00"
|
|
|
|
def test_skin_color_passthrough_in_dark_mode(self, cli_mod, monkeypatch):
|
|
from hermes_cli.skin_engine import SkinConfig
|
|
|
|
cli_mod._LIGHT_MODE_CACHE = False
|
|
skin = SkinConfig(name="test", colors={"banner_text": "#FFF8DC"})
|
|
assert skin.get_color("banner_text") == "#FFF8DC"
|
|
|
|
|
|
@pytest.mark.platforms("linux")
|
|
class TestOsc11DrainGuard:
|
|
"""Regression: a late-arriving OSC 11 reply must not leak into
|
|
prompt_toolkit's input buffer (#40250).
|
|
|
|
Two layers guard against this: the DA1 fence keeps the main read loop
|
|
listening until the terminal proves it has processed our query, and
|
|
the drain loop in the ``finally`` block reads (and discards) any
|
|
stragglers that slip past TCSAFLUSH.
|
|
"""
|
|
|
|
def test_late_reply_is_consumed_not_leaked(self, cli_mod, monkeypatch):
|
|
"""Simulate a terminal that sends the OSC 11 reply 150ms after the
|
|
query. With the DA1 fence the main loop is still listening, so the
|
|
reply is consumed AND used; nothing remains for prompt_toolkit."""
|
|
import os, termios, tty as _tty
|
|
|
|
# Create a pipe pair to fake stdin
|
|
read_fd, write_fd = os.pipe()
|
|
|
|
# Set up fake termios on the read end
|
|
# We'll monkeypatch tcgetattr/tcsetattr to no-op
|
|
fake_attrs = [0, 0, 0, 0, 0, 0, [b'\x00'] * 32]
|
|
monkeypatch.setattr(termios, "tcgetattr", lambda fd: fake_attrs)
|
|
monkeypatch.setattr(termios, "tcsetattr", lambda fd, when, attrs: None)
|
|
monkeypatch.setattr(_tty, "setcbreak", lambda fd: None)
|
|
|
|
# Make stdin.isatty / stdout.isatty return True
|
|
monkeypatch.setattr(cli_mod.sys.stdin, "isatty", lambda: True, raising=False)
|
|
monkeypatch.setattr(cli_mod.sys.stdout, "isatty", lambda: True, raising=False)
|
|
monkeypatch.setattr(cli_mod.sys.stdin, "fileno", lambda: read_fd, raising=False)
|
|
|
|
# Clear SSH env vars
|
|
for v in ("SSH_CONNECTION", "SSH_CLIENT", "SSH_TTY"):
|
|
monkeypatch.delenv(v, raising=False)
|
|
|
|
# Write a delayed OSC 11 reply (then the DA1 fence reply) — the
|
|
# fenced main loop must still be listening and consume both.
|
|
import threading
|
|
|
|
def delayed_write():
|
|
import time
|
|
time.sleep(0.15)
|
|
os.write(write_fd, b"\x1b]11;rgb:0c0c/0c0c/0c0c\x1b\\\x1b[?62;22c")
|
|
|
|
t = threading.Thread(target=delayed_write, daemon=True)
|
|
t.start()
|
|
|
|
# The late reply is consumed by the fenced read loop and used.
|
|
result = cli_mod._query_osc11_background()
|
|
assert result == "#0C0C0C"
|
|
|
|
# Verify the pipe is drained — a non-blocking read should return empty
|
|
import select
|
|
r, _, _ = select.select([read_fd], [], [], 0)
|
|
assert not r, "late OSC 11 bytes must be consumed, not left to leak"
|
|
|
|
os.close(read_fd)
|
|
os.close(write_fd)
|
|
|
|
def test_post_deadline_straggler_is_drained(self, cli_mod, monkeypatch):
|
|
"""Bytes that arrive after the main loop has already finished (DA1
|
|
answered instantly, reply straggles in during teardown) are eaten
|
|
by the post-flush drain window instead of leaking (#40250)."""
|
|
import os, termios, tty as _tty
|
|
|
|
read_fd, write_fd = os.pipe()
|
|
fake_attrs = [0, 0, 0, 0, 0, 0, [b'\x00'] * 32]
|
|
monkeypatch.setattr(termios, "tcgetattr", lambda fd: fake_attrs)
|
|
monkeypatch.setattr(termios, "tcsetattr", lambda fd, when, attrs: None)
|
|
monkeypatch.setattr(_tty, "setcbreak", lambda fd: None)
|
|
monkeypatch.setattr(cli_mod.sys.stdin, "isatty", lambda: True, raising=False)
|
|
monkeypatch.setattr(cli_mod.sys.stdout, "isatty", lambda: True, raising=False)
|
|
monkeypatch.setattr(cli_mod.sys.stdin, "fileno", lambda: read_fd, raising=False)
|
|
for v in ("SSH_CONNECTION", "SSH_CLIENT", "SSH_TTY"):
|
|
monkeypatch.delenv(v, raising=False)
|
|
|
|
# DA1 answered immediately (herdr-style: OSC 11 swallowed) — main
|
|
# loop exits fast — then a straggler payload lands during teardown.
|
|
os.write(write_fd, b"\x1b[?62;22c")
|
|
|
|
import threading
|
|
|
|
def straggler():
|
|
import time
|
|
time.sleep(0.02) # inside the 50ms drain window
|
|
os.write(write_fd, b"\x1b]11;rgb:0c0c/0c0c/0c0c\x1b\\")
|
|
|
|
t = threading.Thread(target=straggler, daemon=True)
|
|
t.start()
|
|
|
|
result = cli_mod._query_osc11_background()
|
|
assert result is None # OSC 11 was swallowed; only DA1 answered
|
|
|
|
import select
|
|
r, _, _ = select.select([read_fd], [], [], 0)
|
|
assert not r, "drain loop should have consumed the straggler bytes"
|
|
|
|
os.close(read_fd)
|
|
os.close(write_fd)
|
|
|
|
|
|
# ────────────────────────────────────────────────────────────────────────
|
|
# OSC 11 query — DA1 fence behavior.
|
|
#
|
|
# The query is fenced with a DA1 sentinel so a terminal manager that
|
|
# swallows OSC 11 (herdr) or relays it slowly (SSH bridges, some tmux
|
|
# setups) can never leave reply bytes in the tty buffer for
|
|
# prompt_toolkit to read as typed input. These tests run the real
|
|
# function in a child on a real PTY and play the terminal's role from
|
|
# the parent side.
|
|
|
|
import os as _os
|
|
import sys as _sys
|
|
|
|
|
|
_CHILD_SRC = r"""
|
|
import sys, os
|
|
sys.path.insert(0, os.environ["HERMES_REPO"])
|
|
import cli
|
|
bg = cli._query_osc11_background()
|
|
print("RESULT:" + repr(bg), flush=True)
|
|
# Drain anything left in the tty buffer — must be empty (no leak).
|
|
import termios, tty, select, time
|
|
fd = sys.stdin.fileno()
|
|
old = termios.tcgetattr(fd)
|
|
tty.setcbreak(fd)
|
|
buf = b""
|
|
deadline = time.monotonic() + 0.6
|
|
while time.monotonic() < deadline:
|
|
r, _, _ = select.select([fd], [], [], 0.1)
|
|
if r:
|
|
buf += os.read(fd, 256)
|
|
termios.tcsetattr(fd, termios.TCSADRAIN, old)
|
|
print("LEFTOVER:" + repr(buf), flush=True)
|
|
"""
|
|
|
|
|
|
def _run_osc11_child(reply_fn, repo_root, timeout=8.0):
|
|
"""Fork a PTY child running _query_osc11_background().
|
|
|
|
reply_fn(query_age_seconds) -> bytes to write once, or None to wait.
|
|
Returns (result_line, leftover_line).
|
|
"""
|
|
import pty
|
|
import time as _time
|
|
|
|
env = dict(_os.environ, HERMES_REPO=str(repo_root))
|
|
for var in ("SSH_CONNECTION", "SSH_CLIENT", "SSH_TTY"):
|
|
env.pop(var, None)
|
|
pid, master = pty.fork()
|
|
if pid == 0: # child
|
|
_os.execvpe(_sys.executable, [_sys.executable, "-c", _CHILD_SRC], env)
|
|
_os.set_blocking(master, False)
|
|
out = b""
|
|
answered = 0
|
|
query_at = None
|
|
t0 = _time.monotonic()
|
|
try:
|
|
while _time.monotonic() - t0 < timeout:
|
|
try:
|
|
chunk = _os.read(master, 1024)
|
|
if chunk:
|
|
out += chunk
|
|
except (BlockingIOError, OSError):
|
|
pass
|
|
# importing cli primes _detect_light_mode() which issues its own
|
|
# OSC 11 query before the explicit call — answer each query.
|
|
if query_at is None and out.count(b"\x1b]11;?") > answered:
|
|
query_at = _time.monotonic()
|
|
if query_at is not None:
|
|
payload = reply_fn(_time.monotonic() - query_at)
|
|
if payload is not None:
|
|
_os.write(master, payload)
|
|
answered += 1
|
|
query_at = None
|
|
if b"LEFTOVER:" in out and out.rstrip().endswith(b"'"):
|
|
break
|
|
_time.sleep(0.005)
|
|
finally:
|
|
try:
|
|
_os.close(master)
|
|
except OSError:
|
|
pass
|
|
try:
|
|
_os.waitpid(pid, 0)
|
|
except ChildProcessError:
|
|
pass
|
|
text = out.decode("utf-8", "replace")
|
|
print("child raw output:", repr(text)) # aids debugging on failure
|
|
result = leftover = None
|
|
for line in text.splitlines():
|
|
# The PTY echoes the query bytes onto the same line as the first
|
|
# print, so match anywhere in the line rather than at the start.
|
|
if "RESULT:" in line and result is None:
|
|
result = line.split("RESULT:", 1)[1]
|
|
elif "LEFTOVER:" in line and leftover is None:
|
|
leftover = line.split("LEFTOVER:", 1)[1]
|
|
return result, leftover
|
|
|
|
|
|
@pytest.fixture
|
|
def repo_root():
|
|
import pathlib
|
|
return pathlib.Path(__file__).resolve().parents[2]
|
|
|
|
|
|
@pytest.mark.platforms("posix") # POSIX PTY test
|
|
class TestOsc11Da1Fence:
|
|
def test_herdr_style_da1_only_returns_none_without_leak(self, repo_root):
|
|
"""Terminal answers DA1 instantly but swallows OSC 11 (herdr)."""
|
|
result, leftover = _run_osc11_child(
|
|
lambda age: b"\x1b[?62;22c", repo_root
|
|
)
|
|
assert result == "None"
|
|
assert leftover == "b''"
|
|
|
|
def test_slow_inorder_reply_is_consumed_not_leaked(self, repo_root):
|
|
"""OSC 11 reply arrives at +300ms (past the old 100ms budget),
|
|
DA1 right behind it. The fence keeps us listening, so the color
|
|
is detected and nothing leaks into the tty buffer."""
|
|
result, leftover = _run_osc11_child(
|
|
lambda age: (
|
|
b"\x1b]11;rgb:1e1e/1e1e/2e2e\x1b\\\x1b[?62;22c"
|
|
if age > 0.3 else None
|
|
),
|
|
repo_root,
|
|
)
|
|
assert result == "'#1E1E2E'"
|
|
assert leftover == "b''"
|
|
|
|
def test_mute_terminal_times_out_clean(self, repo_root):
|
|
"""Terminal that answers nothing: give up at the safety-net
|
|
deadline with no leftovers."""
|
|
result, leftover = _run_osc11_child(lambda age: None, repo_root)
|
|
assert result == "None"
|
|
assert leftover == "b''"
|