From 666a7190d448661c226c54e1d9f6d1aec68d40bf Mon Sep 17 00:00:00 2001 From: Hassan Raza Date: Sat, 26 Sep 2026 22:06:15 +0500 Subject: [PATCH] Use parsed command boundary for session expansion --- docs/changelog.rst | 2 ++ kitty/session.py | 5 +---- kitty_tests/options.py | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 8d3a5e01f..2fb15da2e 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -202,6 +202,8 @@ Detailed list of changes 0.49.2 [future] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +- Sessions: Expand launch option variables when an option value matches the command name + - Preserve transparent background colors when applying unrelated launch color overrides - ssh kitten: Preserve SSH option values following a spaced :code:`--kitten` option diff --git a/kitty/session.py b/kitty/session.py index 6a7d877fc..1bce73a64 100644 --- a/kitty/session.py +++ b/kitty/session.py @@ -131,10 +131,7 @@ class Session: spec = parse_launch_args(cmd) if needs_expandvars: assert isinstance(cmd, list) - limit = len(cmd) - if len(spec.args): - with suppress(ValueError): - limit = cmd.index(spec.args[0]) + limit = len(cmd) - len(spec.args) cmd = [(expand(x) if i < limit else x) for i, x in enumerate(cmd)] spec = parse_launch_args(cmd) diff --git a/kitty_tests/options.py b/kitty_tests/options.py index ce820de6d..0b0fb76e2 100644 --- a/kitty_tests/options.py +++ b/kitty_tests/options.py @@ -38,6 +38,24 @@ class TestConfParsing(BaseTest): def test_font_size_clamping(self): font_size_clamping(self) + def test_session_launch_option_expansion(self) -> None: + from kitty.launch import LaunchSpec + from kitty.options.types import defaults + from kitty.session import parse_session + + for command in ( + '--title bash --cwd $SESSION_DIR bash $COMMAND_ARG', + '--title=bash --cwd=$SESSION_DIR bash $COMMAND_ARG', + '--title bash --cwd $SESSION_DIR -- bash $COMMAND_ARG', + '--title other --cwd $SESSION_DIR bash $COMMAND_ARG', + ): + with self.subTest(command=command): + (session,) = parse_session(f'launch {command}', defaults, environ={'SESSION_DIR': '/tmp/session', 'COMMAND_ARG': 'expanded'}) + spec = session.tabs[0].windows[0].launch_spec + assert isinstance(spec, LaunchSpec) + self.ae(spec.opts.cwd, '/tmp/session') + self.ae(spec.args, ['bash', '$COMMAND_ARG']) + def test_session_discovery(self): from unittest.mock import patch