it2 0.2.1__tar.gz → 0.2.3__tar.gz

{it2-0.2.1 → it2-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: it2
-Version: 0.2.1
+Version: 0.2.3
 Summary: A powerful command-line interface for controlling iTerm2
 Project-URL: Homepage, https://github.com/mkusaka/it2
 Project-URL: Bug Tracker, https://github.com/mkusaka/it2/issues

{it2-0.2.1 → it2-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "it2"
-version = "0.2.1"
+version = "0.2.3"
 description = "A powerful command-line interface for controlling iTerm2"
 readme = "README.md"
 license = {file = "LICENSE"}

{it2-0.2.1 → it2-0.2.3}/src/it2/__init__.py

@@ -1,3 +1,3 @@
 """iTerm2 CLI - A powerful command-line interface for controlling iTerm2."""
 
-__version__ = "0.2.1"
+__version__ = "0.2.3"

{it2-0.2.1 → it2-0.2.3}/src/it2/commands/app.py

@@ -5,6 +5,7 @@ import iterm2
 
 from ..core.connection import run_command
 from ..core.errors import handle_error
+from ..core.session_handler import get_session_by_id
 
 # Theme value mapping for PreferenceKey.THEME
 _THEME_MAP = {
@@ -105,7 +106,7 @@ async def broadcast_add(
     # Verify all sessions exist
     sessions = []
     for sid in session_ids:
-        session = app.get_session_by_id(sid)
+        session = get_session_by_id(app, sid)
         if not session:
             handle_error(f"Session '{sid}' not found", 3)
         sessions.append(session)

{it2-0.2.1 → it2-0.2.3}/src/it2/commands/profile.py

@@ -10,6 +10,7 @@ from rich.table import Table
 
 from ..core.connection import run_command
 from ..core.errors import handle_error
+from ..core.session_handler import get_session_by_id
 
 console = Console()
 
@@ -142,7 +143,7 @@ async def apply(
 
     # Get target session
     if session:
-        target_session = app.get_session_by_id(session)
+        target_session = get_session_by_id(app, session)
         if not target_session:
             handle_error(f"Session '{session}' not found", 3)
     else:

{it2-0.2.1 → it2-0.2.3}/src/it2/commands/session.py

@@ -9,7 +9,7 @@ from rich.table import Table
 
 from ..core.connection import run_command
 from ..core.errors import handle_error
-from ..core.session_handler import get_session_info, get_target_sessions
+from ..core.session_handler import get_session_by_id, get_session_info, get_target_sessions
 
 console = Console()
 
@@ -157,7 +157,7 @@ async def restart(session: str | None, connection: iterm2.Connection, app: iterm
 @run_command
 async def focus(session_id: str, connection: iterm2.Connection, app: iterm2.App) -> None:
     """Focus a specific session."""
-    target_session = app.get_session_by_id(session_id)
+    target_session = get_session_by_id(app, session_id)
     if not target_session:
         handle_error(f"Session '{session_id}' not found", 3)
 

{it2-0.2.1 → it2-0.2.3}/src/it2/core/session_handler.py

@@ -1,9 +1,74 @@
 """Session handling utilities for iTerm2 CLI."""
 
+import re
 import sys
 
 from iterm2 import App, Session
 
+_UUID_PATTERN = r"[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}"
+# iTerm2 commonly exposes these aliases:
+# - ITERM_SESSION_ID / TERM_SESSION_ID: w<window>t<tab>p<pane>:<GUID>
+# - session.termid variable:            w<window>t<tab>p<pane>.<GUID>
+# Only the GUID portion is the canonical API session identifier.
+_ITERM_SESSION_ID_RE = re.compile(rf"^w\d+t\d+p\d+:(?P<uuid>{_UUID_PATTERN})$")
+_TERMID_RE = re.compile(rf"^w\d+t\d+p\d+\.(?P<uuid>{_UUID_PATTERN})$")
+
+
+def normalize_session_id(session_id: str | None) -> str | None:
+    """Normalize session ID aliases to a canonical UUID when possible.
+
+    Why this exists:
+      iTerm2 core builds ``ITERM_SESSION_ID`` in the form
+      ``w<window>t<tab>p<pane>:<guid>`` (see PTYSession.sessionId), and also
+      publishes ``session.termid`` as ``w<window>t<tab>p<pane>.<guid>``.
+      However, iTerm2's Python API stores ``Session.session_id`` as only the
+      GUID and ``App.get_session_by_id`` does an exact string match against that
+      GUID. Passing prefixed aliases directly therefore fails lookup.
+
+    When this is needed:
+      Any time we accept user-provided session identifiers (CLI args, env vars,
+      script output), because those inputs often come from shell integration
+      variables instead of the bare API GUID.
+    """
+    if session_id is None:
+        return None
+
+    if session_id in {"active", "all"}:
+        return session_id
+
+    match = _ITERM_SESSION_ID_RE.match(session_id)
+    if match:
+        return match.group("uuid")
+
+    match = _TERMID_RE.match(session_id)
+    if match:
+        return match.group("uuid")
+
+    return session_id
+
+
+def get_session_by_id(app: App, session_id: str | None) -> Session | None:
+    """Get a session by ID while accepting common iTerm2 alias formats.
+
+    This centralizes the ID-shape mismatch between shell-facing identifiers and
+    API-facing identifiers so command handlers can call one safe lookup path.
+    """
+    if session_id is None:
+        return None
+
+    normalized = normalize_session_id(session_id)
+    if normalized is None:
+        return None
+
+    session = app.get_session_by_id(normalized)
+    if session:
+        return session
+
+    # Fallback for unexpected future formats where normalization is too strict.
+    if normalized != session_id:
+        return app.get_session_by_id(session_id)
+    return None
+
 
 async def get_target_sessions(
     app: App, session_id: str | None = None, all_sessions: bool = False
@@ -28,7 +93,7 @@ async def get_target_sessions(
 
     if session_id and session_id != "active":
         # Get specific session by ID
-        session = app.get_session_by_id(session_id)
+        session = get_session_by_id(app, session_id)
         if not session:
             print(f"Error: Session '{session_id}' not found", file=sys.stderr)
             sys.exit(3)