Merge branch 'fix/session-option-boundary' of https://github.com/M-Hassan-Raza/kitty

This commit is contained in:
Kovid Goyal 2026-09-28 06:35:47 +05:30
commit c4e1a9572b
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
3 changed files with 21 additions and 4 deletions

View file

@ -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

View file

@ -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)

View file

@ -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