machineconfig 6.83__tar.gz → 6.85__tar.gz

{machineconfig-6.83/src/machineconfig.egg-info → machineconfig-6.85}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 6.83
+Version: 6.85
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-6.83 → machineconfig-6.85}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "6.83"
+version = "6.85"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -70,6 +70,7 @@ croshell = "machineconfig.scripts.python.croshell:main"
 ftpx = "machineconfig.scripts.python.ftpx:main"
 utils = "machineconfig.scripts.python.utils:main"
 mcfg = "machineconfig.scripts.python.mcfg:main"
+terminal = "machineconfig.scripts.python.terminal:main"
 
 [tool.setuptools]
 package-dir = {"" = "src"}

machineconfig-6.85/src/machineconfig/cluster/sessions_managers/wt_local.py

@@ -0,0 +1,226 @@
+#!/usr/bin/env python3
+"""
+Windows Terminal local layout generator and session manager.
+Equivalent to zellij_local.py but for Windows Terminal.
+
+https://github.com/ruby9455/app_management/tree/main/app_management
+
+"""
+
+import subprocess
+import platform
+from typing import Optional, Any
+from pathlib import Path
+import logging
+
+from rich.console import Console
+from rich.panel import Panel
+from rich.table import Table
+
+from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
+from machineconfig.cluster.sessions_managers.wt_utils.wt_helpers import (
+    generate_random_suffix,
+    # escape_for_wt,
+    validate_layout_config,
+    generate_wt_command_string,
+    check_wt_session_status,
+    check_command_status,
+)
+
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+console = Console()
+
+# Check if we're on Windows
+IS_WINDOWS = platform.system().lower() == "windows"
+POWERSHELL_CMD = "powershell" if IS_WINDOWS else "pwsh"  # Use pwsh on non-Windows systems
+TMP_LAYOUT_DIR = Path.home() / "tmp_results" / "wt_layouts"
+
+
+class WTLayoutGenerator:
+    def __init__(self, layout_config: LayoutConfig, session_name: str):
+        self.session_name: str = session_name
+        self.layout_config: LayoutConfig = layout_config.copy()
+        self.script_path: Optional[str] = None
+
+    def create_layout_file(self) -> bool:
+        """Create Windows Terminal layout file and return success status."""
+        validate_layout_config(self.layout_config)
+        tab_count = len(self.layout_config['layoutTabs'])
+        layout_name = self.layout_config['layoutName']
+        console.print(f"[bold cyan]📋 Creating Windows Terminal layout[/bold cyan] [bright_green]'{layout_name}' with {tab_count} tabs[/bright_green]")
+        
+        for tab in self.layout_config['layoutTabs']:
+            console.print(f"  [yellow]→[/yellow] [bold]{tab['tabName']}[/bold] [dim]in[/dim] [blue]{tab['startDir']}[/blue]")
+
+        wt_command = generate_wt_command_string(self.layout_config, self.session_name)
+
+        random_suffix = generate_random_suffix(8)
+        script_content = f"""# Windows Terminal layout for {self.session_name}
+# Generated with random suffix: {random_suffix}
+{wt_command}
+"""
+        tmp_dir = Path(TMP_LAYOUT_DIR)
+        tmp_dir.mkdir(parents=True, exist_ok=True)
+        script_file = tmp_dir / f"wt_layout_{self.session_name}_{random_suffix}.ps1"
+        script_file.write_text(script_content, encoding="utf-8")
+        self.script_path = str(script_file.absolute())
+
+        console.print(f"[bold green]✅ Layout created successfully:[/bold green] [cyan]{self.script_path}[/cyan]")
+        return True
+
+    def get_wt_layout_preview(self, layout_config: LayoutConfig) -> str:
+        """Generate preview of the Windows Terminal command that would be created."""
+        validate_layout_config(layout_config)
+        return generate_wt_command_string(layout_config, "preview")
+
+    def check_all_commands_status(self) -> dict[str, dict[str, Any]]:
+        if not self.layout_config:
+            logger.warning("No layout config tracked. Make sure to create a layout first.")
+            return {}
+
+        status_report = {}
+        for tab in self.layout_config["layoutTabs"]:
+            tab_name = tab["tabName"]
+            status_report[tab_name] = check_command_status(tab_name, self.layout_config)
+
+        return status_report
+
+    def get_status_report(self) -> dict[str, Any]:
+        """Get status report for this layout including Windows Terminal and commands."""
+        wt_status = check_wt_session_status(self.session_name or "default")
+        commands_status = self.check_all_commands_status()
+
+        running_count = sum(1 for status in commands_status.values() if status.get("running", False))
+        total_count = len(commands_status)
+
+        return {
+            "wt_session": wt_status,
+            "commands": commands_status,
+            "summary": {"total_commands": total_count, "running_commands": running_count, "stopped_commands": total_count - running_count, "session_healthy": wt_status.get("session_exists", False)},
+        }
+
+    def print_status_report(self) -> None:
+        """Print a comprehensive status report for this Windows Terminal layout."""
+        status = self.get_status_report()
+        wt_session = status["wt_session"]
+        commands = status["commands"]
+        summary = status["summary"]
+
+        console.print()
+        console.print(Panel.fit("� WINDOWS TERMINAL LAYOUT STATUS REPORT", style="bold cyan"))
+
+        # Windows Terminal session status
+        if wt_session.get("wt_running", False):
+            if wt_session.get("session_exists", False):
+                session_windows = wt_session.get("session_windows", [])
+                all_windows = wt_session.get("all_windows", [])
+                console.print(f"[bold green]✅ Windows Terminal session[/bold green] [yellow]'{self.session_name}'[/yellow] [green]is running[/green]")
+                console.print(f"   Session windows: {len(session_windows)}")
+                console.print(f"   Total WT windows: {len(all_windows)}")
+            else:
+                console.print(f"[bold yellow]⚠️  Windows Terminal is running but session[/bold yellow] [yellow]'{self.session_name}'[/yellow] [yellow]not found[/yellow]")
+        else:
+            error_msg = wt_session.get("error", "Unknown error")
+            console.print(f"[bold red]❌ Windows Terminal session issue:[/bold red] [red]{error_msg}[/red]")
+
+        console.print()
+
+        # Commands status table
+        table = Table(title="📋 COMMAND STATUS", show_header=True, header_style="bold magenta")
+        table.add_column("Tab", style="cyan", no_wrap=True)
+        table.add_column("Status", justify="center")
+        table.add_column("PID", justify="center", style="dim")
+        table.add_column("Command", style="green", max_width=40)
+
+        for tab_name, cmd_status in commands.items():
+            if cmd_status.get("running", False):
+                status_text = "[bold green]✅ Running[/bold green]"
+                processes = cmd_status.get("processes", [])
+                if processes:
+                    proc = processes[0]
+                    pid = str(proc.get("pid", "N/A"))
+                else:
+                    pid = "N/A"
+            else:
+                status_text = "[bold red]❌ Stopped[/bold red]"
+                pid = "N/A"
+
+            command = cmd_status.get("command", "Unknown")
+            if len(command) > 35:
+                command = command[:32] + "..."
+
+            table.add_row(tab_name, status_text, pid, command)
+
+        console.print(table)
+        console.print()
+
+        # Summary panel
+        summary_text = f"""[bold]Total commands:[/bold] {summary['total_commands']}
+[green]Running:[/green] {summary['running_commands']}
+[red]Stopped:[/red] {summary['stopped_commands']}
+[yellow]Session healthy:[/yellow] {"✅" if summary['session_healthy'] else "❌"}"""
+
+        console.print(Panel(summary_text, title="📊 Summary", style="blue"))
+
+
+def create_wt_layout(layout_config: LayoutConfig, output_path: str) -> str:
+    session_name = layout_config["layoutName"]
+    generator = WTLayoutGenerator(layout_config=layout_config, session_name=session_name)
+    generator.create_layout_file()
+    
+    if generator.script_path is None:
+        raise RuntimeError("Script path was not set after creating layout file")
+    
+    logger.info(f"Windows Terminal PowerShell script created: {generator.script_path}")
+    return generator.script_path
+
+
+def run_wt_layout(layout_config: LayoutConfig) -> None:
+    """Create and run a Windows Terminal layout."""
+    session_name = layout_config["layoutName"]
+    generator = WTLayoutGenerator(layout_config=layout_config, session_name=session_name)
+    generator.create_layout_file()
+    if generator.script_path is None:
+        raise RuntimeError("Script path was not set after creating layout file")
+    # Execute the script
+    cmd = f'powershell -ExecutionPolicy Bypass -File "{generator.script_path}"'
+    result = subprocess.run(cmd, shell=True, capture_output=True, text=True)
+    if result.returncode == 0:
+        print(f"Windows Terminal layout is running @ {layout_config['layoutName']}")
+    else:
+        logger.error(f"Failed to run Windows Terminal layout: {result.stderr}")
+        raise RuntimeError(f"Failed to run layout: {result.stderr}")
+
+
+def run_command_in_wt_tab(command: str, tab_name: str, cwd: Optional[str]) -> str:
+    """Create a command to run in a new Windows Terminal tab."""
+    cwd_part = f'-d "{cwd}"' if cwd else ""
+    return f"""
+echo "Creating new Windows Terminal tab: {tab_name}"
+wt new-tab --title "{tab_name}" {cwd_part} "{command}"
+"""
+
+
+if __name__ == "__main__":
+    sample_layout: LayoutConfig = {"layoutName": "TestLayout",
+                                   "layoutTabs": [
+            {"tabName": "Frontend", "startDir": "~/code", "command": "btm"},
+            {"tabName": "Monitor", "startDir": "~", "command": "lf"}
+            ]}
+    try:
+        session_name = sample_layout["layoutName"]
+        generator = WTLayoutGenerator(layout_config=sample_layout, session_name=session_name)
+        generator.create_layout_file()
+        
+        print(f"✅ Windows Terminal layout created: {generator.script_path}")
+        preview = generator.get_wt_layout_preview(generator.layout_config)
+        print(f"📋 Command Preview:\n{preview}")
+        print("🔍 Current status:")
+        generator.print_status_report()
+        print("▶️  To run this layout, execute:")
+        print(f'   powershell -ExecutionPolicy Bypass -File "{generator.script_path}"')
+    except Exception as e:
+        print(f"❌ Error: {e}")
+        import traceback
+        traceback.print_exc()

{machineconfig-6.83 → machineconfig-6.85}/src/machineconfig/cluster/sessions_managers/wt_local_manager.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python3
 from datetime import datetime
-import json
-import uuid
 import logging
 import subprocess
 from pathlib import Path
@@ -9,9 +7,14 @@ from typing import Optional, Any
 from rich.console import Console
 from machineconfig.utils.scheduler import Scheduler
 from machineconfig.cluster.sessions_managers.wt_local import WTLayoutGenerator
+from machineconfig.cluster.sessions_managers.wt_utils.wt_helpers import check_wt_session_status
 from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
-from machineconfig.cluster.sessions_managers.zellij_utils.monitoring_types import (
-    StartResult, GlobalSummary, ActiveSessionInfo
+from machineconfig.cluster.sessions_managers.zellij_utils.monitoring_types import StartResult, ActiveSessionInfo
+from machineconfig.cluster.sessions_managers.wt_utils.manager_persistence import (
+    generate_session_id, save_json_file, load_json_file, list_saved_sessions_in_dir, delete_session_dir, ensure_session_dir_exists
+)
+from machineconfig.cluster.sessions_managers.wt_utils.status_reporting import (
+    print_global_summary, print_session_health_status, print_commands_status, calculate_session_summary, calculate_global_summary_from_status
 )
 
 
@@ -129,104 +132,29 @@ class WTLocalManager:
             return "\n".join(commands)
 
     def check_all_sessions_status(self) -> dict[str, dict[str, Any]]:
-        """Check the status of all sessions and their commands."""
         status_report = {}
-
         for manager in self.managers:
             session_name = manager.session_name or "default"
-
-            # Get session status
-            session_status = WTLayoutGenerator.check_wt_session_status(session_name)
-
-            # Get commands status for this session
+            session_status = check_wt_session_status(session_name)
             commands_status = manager.check_all_commands_status()
-
-            # Calculate summary for this session
-            running_count = sum(1 for status in commands_status.values() if status.get("running", False))
-            total_count = len(commands_status)
-
-            status_report[session_name] = {
-                "session_status": session_status,
-                "commands_status": commands_status,
-                "summary": {"total_commands": total_count, "running_commands": running_count, "stopped_commands": total_count - running_count, "session_healthy": session_status.get("session_exists", False)},
-            }
-
+            summary = calculate_session_summary(commands_status, session_status.get("session_exists", False))
+            status_report[session_name] = {"session_status": session_status, "commands_status": commands_status, "summary": summary}
         return status_report
 
-    def get_global_summary(self) -> GlobalSummary:
-        """Get a global summary across all sessions."""
+    def get_global_summary(self) -> dict[str, Any]:
         all_status = self.check_all_sessions_status()
-
-        total_sessions = len(all_status)
-        healthy_sessions = sum(1 for status in all_status.values() if status["summary"]["session_healthy"])
-        total_commands = sum(status["summary"]["total_commands"] for status in all_status.values())
-        total_running = sum(status["summary"]["running_commands"] for status in all_status.values())
-
-        return {
-            "total_sessions": total_sessions,
-            "healthy_sessions": healthy_sessions,
-            "unhealthy_sessions": total_sessions - healthy_sessions,
-            "total_commands": total_commands,
-            "running_commands": total_running,
-            "stopped_commands": total_commands - total_running,
-            "all_sessions_healthy": healthy_sessions == total_sessions,
-            "all_commands_running": total_running == total_commands,
-        }
+        return calculate_global_summary_from_status(all_status, include_remote_machines=False)
 
     def print_status_report(self) -> None:
-        """Print a comprehensive status report for all sessions."""
         all_status = self.check_all_sessions_status()
         global_summary = self.get_global_summary()
-
-        print("=" * 80)
-        print("🖥️  WINDOWS TERMINAL LOCAL MANAGER STATUS REPORT")
-        print("=" * 80)
-
-        # Global summary
-        print("🌐 GLOBAL SUMMARY:")
-        print(f"   Total sessions: {global_summary['total_sessions']}")
-        print(f"   Healthy sessions: {global_summary['healthy_sessions']}")
-        print(f"   Total commands: {global_summary['total_commands']}")
-        print(f"   Running commands: {global_summary['running_commands']}")
-        print(f"   All healthy: {'✅' if global_summary['all_sessions_healthy'] else '❌'}")
-        print()
-
-        # Per-session details
+        print_global_summary(global_summary, "WINDOWS TERMINAL LOCAL MANAGER STATUS REPORT")
         for session_name, status in all_status.items():
-            session_status = status["session_status"]
-            commands_status = status["commands_status"]
-            summary = status["summary"]
-
             print(f"🪟 SESSION: {session_name}")
             print("-" * 60)
-
-            # Session health
-            if session_status.get("wt_running", False):
-                if session_status.get("session_exists", False):
-                    session_windows = session_status.get("session_windows", [])
-                    all_windows = session_status.get("all_windows", [])
-                    print("✅ Windows Terminal is running")
-                    print(f"   Session windows: {len(session_windows)}")
-                    print(f"   Total WT windows: {len(all_windows)}")
-                else:
-                    print("⚠️  Windows Terminal is running but no session windows found")
-            else:
-                print(f"❌ Windows Terminal session issue: {session_status.get('error', 'Unknown error')}")
-
-            # Commands in this session
-            print(f"   Commands ({summary['running_commands']}/{summary['total_commands']} running):")
-            for tab_name, cmd_status in commands_status.items():
-                status_icon = "✅" if cmd_status.get("running", False) else "❌"
-                cmd_text = cmd_status.get("command", "Unknown")[:50]
-                if len(cmd_status.get("command", "")) > 50:
-                    cmd_text += "..."
-                console.print(f"     {status_icon} {tab_name}: {cmd_text}")
-
-                if cmd_status.get("processes"):
-                    for proc in cmd_status["processes"][:2]:  # Show first 2 processes
-                        console.print(f"        [dim]└─[/dim] PID {proc['pid']}: {proc['name']}")
+            print_session_health_status(status["session_status"], remote_name=None)
+            print_commands_status(status["commands_status"], status["summary"])
             print()
-
         print("=" * 80)
 
     def run_monitoring_routine(self, wait_ms: int = 30000) -> None:
@@ -288,126 +216,59 @@ class WTLocalManager:
         sched.run(max_cycles=None)
 
     def save(self, session_id: Optional[str] = None) -> str:
-        """Save the manager state to disk."""
         if session_id is None:
-            session_id = str(uuid.uuid4())[:8]
-
-        # Create session directory
+            session_id = generate_session_id()
         session_dir = TMP_SERIALIZATION_DIR / session_id
-        session_dir.mkdir(parents=True, exist_ok=True)
-
-        # Save the session2wt_tabs configuration
-        config_file = session_dir / "session_layouts.json"
-        text = json.dumps(self.session_layouts, indent=2, ensure_ascii=False)
-        config_file.write_text(text, encoding="utf-8")
-
-        # Save metadata
+        ensure_session_dir_exists(session_dir)
+        save_json_file(session_dir / "session_layouts.json", self.session_layouts, "session layouts")
         metadata = {"session_name_prefix": self.session_name_prefix, "created_at": str(datetime.now()), "num_managers": len(self.managers), "sessions": [item["layoutName"] for item in self.session_layouts], "manager_type": "WTLocalManager"}
-        metadata_file = session_dir / "metadata.json"
-        text = json.dumps(metadata, indent=2, ensure_ascii=False)
-        metadata_file.write_text(text, encoding="utf-8")
-
-        # Save each manager's state
+        save_json_file(session_dir / "metadata.json", metadata, "metadata")
         managers_dir = session_dir / "managers"
         managers_dir.mkdir(exist_ok=True)
-
         for i, manager in enumerate(self.managers):
             manager_data = {"session_name": manager.session_name, "layout_config": manager.layout_config, "script_path": manager.script_path}
-            manager_file = managers_dir / f"manager_{i}_{manager.session_name}.json"
-            text = json.dumps(manager_data, indent=2, ensure_ascii=False)
-            manager_file.write_text(text, encoding="utf-8")
-
+            save_json_file(managers_dir / f"manager_{i}_{manager.session_name}.json", manager_data, f"manager {i}")
         logger.info(f"✅ Saved WTLocalManager session to: {session_dir}")
         return session_id
 
     @classmethod
     def load(cls, session_id: str) -> "WTLocalManager":
-        """Load a saved manager state from disk."""
         session_dir = TMP_SERIALIZATION_DIR / session_id
-
         if not session_dir.exists():
             raise FileNotFoundError(f"Session directory not found: {session_dir}")
-
-        # Load configuration
-        config_file = session_dir / "session_layouts.json"
-        if not config_file.exists():
-            raise FileNotFoundError(f"Configuration file not found: {config_file}")
-
-        text = config_file.read_text(encoding="utf-8")
-        session_layouts = json.loads(text)
-
-        # Load metadata
-        metadata_file = session_dir / "metadata.json"
-        session_name_prefix = "LocalWTMgr"  # default fallback
-        if metadata_file.exists():
-            text = metadata_file.read_text(encoding="utf-8")
-            metadata = json.loads(text)
-            session_name_prefix = metadata.get("session_name_prefix", "LocalWTMgr")
-
-        # Create new instance
+        loaded_data = load_json_file(session_dir / "session_layouts.json", "Configuration file")
+        session_layouts = loaded_data if isinstance(loaded_data, list) else []  # type: ignore[arg-type]
+        metadata_data = load_json_file(session_dir / "metadata.json", "Metadata file") if (session_dir / "metadata.json").exists() else {}
+        metadata = metadata_data if isinstance(metadata_data, dict) else {}  # type: ignore[arg-type]
+        session_name_prefix = metadata.get("session_name_prefix", "LocalWTMgr")  # type: ignore[union-attr]
         instance = cls(session_layouts=session_layouts, session_name_prefix=session_name_prefix)
-
-        # Load saved manager states
         managers_dir = session_dir / "managers"
         if managers_dir.exists():
             instance.managers = []
-            manager_files = sorted(managers_dir.glob("manager_*.json"))
-
-            for manager_file in manager_files:
+            for manager_file in sorted(managers_dir.glob("manager_*.json")):
                 try:
-                    text = manager_file.read_text(encoding="utf-8")
-                    manager_data = json.loads(text)
-
-                    # Recreate the manager
-                    manager = WTLayoutGenerator(layout_config=manager_data["layout_config"], session_name=manager_data["session_name"])
-                    manager.script_path = manager_data["script_path"]
-
+                    loaded_manager_data = load_json_file(manager_file, "Manager data")
+                    manager_data = loaded_manager_data if isinstance(loaded_manager_data, dict) else {}  # type: ignore[arg-type]
+                    manager = WTLayoutGenerator(layout_config=manager_data["layout_config"], session_name=manager_data["session_name"])  # type: ignore[typeddict-item]
+                    manager.script_path = manager_data["script_path"]  # type: ignore[typeddict-item]
                     instance.managers.append(manager)
-
                 except Exception as e:
                     logger.warning(f"Failed to load manager from {manager_file}: {e}")
-
         logger.info(f"✅ Loaded WTLocalManager session from: {session_dir}")
         return instance
 
     @staticmethod
     def list_saved_sessions() -> list[str]:
-        """List all saved session IDs."""
-        if not TMP_SERIALIZATION_DIR.exists():
-            return []
-
-        sessions = []
-        for item in TMP_SERIALIZATION_DIR.iterdir():
-            if item.is_dir() and (item / "metadata.json").exists():
-                sessions.append(item.name)
-
-        return sorted(sessions)
+        return list_saved_sessions_in_dir(TMP_SERIALIZATION_DIR)
 
     @staticmethod
     def delete_session(session_id: str) -> bool:
-        """Delete a saved session."""
-        session_dir = TMP_SERIALIZATION_DIR / session_id
-
-        if not session_dir.exists():
-            logger.warning(f"Session directory not found: {session_dir}")
-            return False
-
-        try:
-            import shutil
-
-            shutil.rmtree(session_dir)
-            logger.info(f"✅ Deleted session: {session_id}")
-            return True
-        except Exception as e:
-            logger.error(f"Failed to delete session {session_id}: {e}")
-            return False
+        return delete_session_dir(TMP_SERIALIZATION_DIR / session_id, session_id)
 
     def list_active_sessions(self) -> list[ActiveSessionInfo]:
-        """List currently active Windows Terminal sessions managed by this instance."""
-        active_sessions = []
+        active_sessions: list[ActiveSessionInfo] = []
 
         try:
-            # Get all running Windows Terminal processes
             result = subprocess.run(
                 ["powershell", "-Command", 'Get-Process -Name "WindowsTerminal" -ErrorAction SilentlyContinue | Select-Object Id, ProcessName, StartTime, MainWindowTitle | ConvertTo-Json -Depth 2'], capture_output=True, text=True, timeout=10
             )
@@ -419,7 +280,6 @@ class WTLocalManager:
                 if not isinstance(all_processes, list):
                     all_processes = [all_processes]
 
-                # Filter to only our managed sessions
                 for manager in self.managers:
                     session_name = manager.session_name
                     session_windows = []
@@ -435,7 +295,6 @@ class WTLocalManager:
                             "is_active": len(session_windows) > 0,
                             "tab_count": len(manager.layout_config["layoutTabs"]) if manager.layout_config else 0,
                             "tabs": [tab["tabName"] for tab in manager.layout_config["layoutTabs"]] if manager.layout_config else [],
-                            "windows": session_windows,
                         }
                     )