machineconfig 7.98__py3-none-any.whl → 8.61__py3-none-any.whl

machineconfig/scripts/python/helpers/helpers_network/ssh/ssh_debug_windows.py

@@ -0,0 +1,245 @@
+
+
+from platform import system
+from pathlib import Path
+from rich.console import Console
+from rich.panel import Panel
+from rich.table import Table
+from rich import box
+import subprocess
+import os
+
+from machineconfig.scripts.python.helpers.helpers_network.ssh.ssh_debug_windows_utils import check_sshd_binary_exists, detect_openssh, run_powershell
+
+
+console = Console()
+
+
+def ssh_debug_windows() -> dict[str, dict[str, str | bool]]:
+    if system() != "Windows":
+        raise NotImplementedError("ssh_debug_windows is only supported on Windows")
+
+    results: dict[str, dict[str, str | bool]] = {}
+    issues: list[tuple[str, str, str]] = []
+    current_user = os.environ.get("USERNAME", "unknown")
+    ssh_port = "22"
+    ip_addresses: list[str] = []
+
+    sshd_exists, sshd_path = check_sshd_binary_exists()
+    install_type, _sshd_exe, config_dir = detect_openssh()
+    ok, hostname = run_powershell("hostname")
+    hostname = hostname if ok else "unknown"
+
+    install_info: list[str] = []
+    if not sshd_exists:
+        results["installation"] = {"status": "error", "message": "sshd.exe not found on system"}
+        issues.append(("sshd.exe not found", "OpenSSH Server binary missing entirely", "Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0"))
+        install_info.append("❌ sshd.exe: [red]NOT FOUND[/red]")
+        install_info.append("   [dim]OpenSSH Server is not installed on this system[/dim]")
+    elif install_type == "not_found":
+        results["installation"] = {"status": "warning", "message": f"sshd found at {sshd_path} but not in standard location"}
+        install_info.append(f"⚠️  sshd.exe: found at [yellow]{sshd_path}[/yellow]")
+        install_info.append("   [dim]Non-standard location - may need manual configuration[/dim]")
+    else:
+        results["installation"] = {"status": "ok", "message": f"OpenSSH installed ({install_type})"}
+        install_info.append(f"✅ OpenSSH Server: installed via {'Windows Capability' if install_type == 'capability' else 'winget'}")
+        install_info.append(f"   Binary: {sshd_path}")
+        install_info.append(f"   Config: {config_dir}")
+
+    ok, status = run_powershell("Get-Service -Name sshd -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Status")
+    if not ok or not status:
+        results["ssh_service"] = {"status": "error", "message": "sshd service not found"}
+        issues.append(("sshd service missing", "SSH daemon not installed", "Install OpenSSH Server first"))
+        install_info.append("❌ sshd service: [red]NOT FOUND[/red]")
+    elif status != "Running":
+        results["ssh_service"] = {"status": "error", "message": f"sshd is {status}"}
+        issues.append((f"sshd is {status}", "SSH connections will be refused", "Start-Service sshd ; Set-Service sshd -StartupType Automatic"))
+        install_info.append(f"❌ sshd service: [yellow]{status}[/yellow]")
+    else:
+        results["ssh_service"] = {"status": "ok", "message": "sshd running"}
+        ok, startup = run_powershell("Get-Service -Name sshd | Select-Object -ExpandProperty StartType")
+        startup_note = f" (startup: {startup})" if ok else ""
+        install_info.append(f"✅ sshd service: [green]Running[/green]{startup_note}")
+
+    console.print(Panel("\n".join(install_info), title="[bold]Installation & Service[/bold]", border_style="blue"))
+
+    ssh_dir = Path.home().joinpath(".ssh")
+    authorized_keys = ssh_dir.joinpath("authorized_keys")
+    admin_auth_keys = Path("C:/ProgramData/ssh/administrators_authorized_keys")
+    perm_info: list[str] = []
+
+    ok, is_admin_str = run_powershell("([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)")
+    is_admin = "True" in is_admin_str
+
+    if is_admin:
+        perm_info.append(f"👤 User [cyan]{current_user}[/cyan] is an [yellow]Administrator[/yellow]")
+        perm_info.append("   ➜ Keys must be in: [cyan]C:\\ProgramData\\ssh\\administrators_authorized_keys[/cyan]")
+        target_auth_keys = admin_auth_keys
+    else:
+        perm_info.append(f"👤 User [cyan]{current_user}[/cyan] is a standard user")
+        perm_info.append(f"   ➜ Keys should be in: [cyan]{authorized_keys}[/cyan]")
+        target_auth_keys = authorized_keys
+
+    if not target_auth_keys.exists():
+        results["authorized_keys"] = {"status": "error", "message": f"{target_auth_keys.name} missing"}
+        issues.append((f"{target_auth_keys.name} missing", "No public keys authorized - SSH login will fail", f"Create file and add your public key to {target_auth_keys}"))
+        perm_info.append(f"\n❌ [red]{target_auth_keys.name} does not exist[/red]")
+        perm_info.append("   [dim]No keys = no login. Add your public key to this file.[/dim]")
+    else:
+        try:
+            keys = [line for line in target_auth_keys.read_text(encoding="utf-8").split("\n") if line.strip()]
+            results["authorized_keys"] = {"status": "ok", "message": f"{len(keys)} key(s)"}
+            perm_info.append(f"\n✅ {target_auth_keys.name}: [green]{len(keys)} key(s)[/green]")
+        except Exception as e:
+            perm_info.append(f"\n⚠️  Could not read {target_auth_keys.name}: {e}")
+
+    if is_admin and admin_auth_keys.exists():
+        ok, icacls_out = run_powershell(f'icacls "{admin_auth_keys}"')
+        if ok:
+            needs_fix = "BUILTIN\\Users" in icacls_out or "Everyone" in icacls_out
+            if needs_fix:
+                results["admin_keys_perms"] = {"status": "error", "message": "Permissions too open"}
+                issues.append(("administrators_authorized_keys permissions wrong", "sshd ignores file if permissions allow other users", f'icacls "{admin_auth_keys}" /inheritance:r /grant "Administrators:F" /grant "SYSTEM:F"'))
+                perm_info.append("❌ [red]Permissions too open[/red] - sshd will ignore this file!")
+            else:
+                perm_info.append("✅ Permissions: restricted to Administrators/SYSTEM")
+
+    console.print(Panel("\n".join(perm_info), title="[bold]Keys & Permissions[/bold]", border_style="blue"))
+
+    net_info: list[str] = []
+    ok, ip_out = run_powershell("Get-NetIPAddress -AddressFamily IPv4 -PrefixOrigin Dhcp,Manual | Where-Object {$_.IPAddress -notlike '127.*' -and $_.IPAddress -notlike '169.254.*'} | Select-Object -ExpandProperty IPAddress")
+    if ok and ip_out:
+        ip_addresses = [ip.strip() for ip in ip_out.split("\n") if ip.strip()]
+        net_info.append(f"🌐 IP addresses: [cyan]{', '.join(ip_addresses)}[/cyan]")
+
+    sshd_config: Path | None = config_dir.joinpath("sshd_config") if config_dir else None
+    config_text: str | None = None
+    if sshd_config and sshd_config.exists():
+        try:
+            config_text = sshd_config.read_text(encoding="utf-8")
+        except PermissionError:
+            ok, config_text_ps = run_powershell(f'Get-Content "{sshd_config}" -Raw')
+            config_text = config_text_ps if ok and config_text_ps else None
+        except Exception:
+            config_text = None
+        if config_text:
+            port_lines = [line for line in config_text.split("\n") if line.strip().startswith("Port") and not line.strip().startswith("#")]
+            if port_lines:
+                ssh_port = port_lines[0].split()[1]
+
+    auth_info: list[str] = []
+    auth_info.append(f"📄 Config file: [cyan]{sshd_config}[/cyan]" if sshd_config else "📄 Config file: [red]not found[/red]")
+    if config_text:
+        pubkey_lines = [line for line in config_text.split("\n") if "PubkeyAuthentication" in line and not line.strip().startswith("#")]
+        if pubkey_lines and "no" in pubkey_lines[-1].lower():
+            results["pubkey_auth"] = {"status": "error", "message": "PubkeyAuthentication disabled"}
+            issues.append(("PubkeyAuthentication disabled", "Key-based login won't work", f'Edit {sshd_config} and set PubkeyAuthentication yes, then Restart-Service sshd'))
+            auth_info.append("❌ PubkeyAuthentication: [red]disabled[/red]")
+        else:
+            results["pubkey_auth"] = {"status": "ok", "message": "PubkeyAuthentication enabled (default)"}
+            auth_info.append("✅ PubkeyAuthentication: [green]enabled[/green] (default: yes)")
+
+        password_lines = [line for line in config_text.split("\n") if "PasswordAuthentication" in line and not line.strip().startswith("#")]
+        if password_lines:
+            password_enabled = "yes" in password_lines[-1].lower()
+            if password_enabled:
+                results["password_auth"] = {"status": "ok", "message": "PasswordAuthentication enabled"}
+                auth_info.append("✅ PasswordAuthentication: [green]enabled[/green]")
+            else:
+                results["password_auth"] = {"status": "info", "message": "PasswordAuthentication disabled"}
+                auth_info.append("🔐 PasswordAuthentication: [yellow]disabled[/yellow] (key-only)")
+        else:
+            results["password_auth"] = {"status": "ok", "message": "PasswordAuthentication enabled (default)"}
+            auth_info.append("✅ PasswordAuthentication: [green]enabled[/green] (default: yes)")
+    else:
+        auth_info.append("⚠️  Could not read sshd_config - auth settings unknown")
+        results["pubkey_auth"] = {"status": "unknown", "message": "Could not read config"}
+        results["password_auth"] = {"status": "unknown", "message": "Could not read config"}
+
+    console.print(Panel("\n".join(auth_info), title="[bold]Authentication Settings[/bold]", border_style="blue"))
+
+    net_info.append(f"🔌 SSH port: [cyan]{ssh_port}[/cyan]")
+    netstat = subprocess.run(["netstat", "-an"], capture_output=True, text=True, check=False)
+    if netstat.returncode == 0:
+        listening_lines = [line for line in netstat.stdout.split("\n") if f":{ssh_port}" in line and "LISTENING" in line]
+        if not listening_lines:
+            results["ssh_listening"] = {"status": "error", "message": f"Not listening on port {ssh_port}"}
+            issues.append((f"SSH not listening on port {ssh_port}", "No connections possible", "Restart-Service sshd"))
+            net_info.append(f"❌ Listening: [red]NOT listening on port {ssh_port}[/red]")
+        elif all("127.0.0.1" in line or "[::1]" in line for line in listening_lines):
+            results["ssh_listening"] = {"status": "error", "message": "Listening on localhost only"}
+            issues.append(("SSH bound to localhost only", "Only local connections work", f"Check ListenAddress in {sshd_config}"))
+            net_info.append("❌ Listening: [red]localhost only[/red] (remote connections blocked)")
+        else:
+            results["ssh_listening"] = {"status": "ok", "message": f"Listening on port {ssh_port}"}
+            net_info.append(f"✅ Listening: 0.0.0.0:{ssh_port}")
+
+    fw_cmd = f"""
+        $rules = Get-NetFirewallRule -ErrorAction SilentlyContinue | Where-Object {{
+            ($_.DisplayName -like '*SSH*' -or $_.DisplayName -like '*OpenSSH*' -or $_.Name -like '*SSH*' -or $_.Name -like '*sshd*') -and
+            $_.Direction -eq 'Inbound'
+        }}
+        if (-not $rules) {{
+            $portFilter = Get-NetFirewallPortFilter -ErrorAction SilentlyContinue | Where-Object {{ $_.LocalPort -eq '{ssh_port}' -and $_.Protocol -eq 'TCP' }}
+            if ($portFilter) {{
+                $rules = $portFilter | ForEach-Object {{ Get-NetFirewallRule -AssociatedNetFirewallPortFilter $_ -ErrorAction SilentlyContinue }} | Where-Object {{ $_.Direction -eq 'Inbound' }}
+            }}
+        }}
+        if ($rules) {{
+            $rules | Select-Object Name, DisplayName, Enabled, Action | Format-List
+        }}
+    """
+    ok, fw_out = run_powershell(fw_cmd)
+    if ok and fw_out.strip():
+        has_allow = "Enabled : True" in fw_out and "Action : Allow" in fw_out
+        if has_allow:
+            results["firewall"] = {"status": "ok", "message": "Firewall allows SSH"}
+            net_info.append("✅ Firewall: SSH rule exists and enabled")
+        else:
+            results["firewall"] = {"status": "warning", "message": "Firewall rule exists but may not be active"}
+            issues.append(("Firewall rule not active", "Incoming SSH may be blocked", f'New-NetFirewallRule -Name "SSH" -DisplayName "SSH" -Protocol TCP -LocalPort {ssh_port} -Action Allow -Enabled True'))
+            net_info.append("⚠️  Firewall: SSH rule exists but [yellow]not enabled[/yellow]")
+    else:
+        if not is_admin:
+            results["firewall"] = {"status": "warning", "message": "Cannot verify firewall (run as Admin)"}
+            net_info.append("⚠️  Firewall: [yellow]Cannot verify - run script as Administrator[/yellow]")
+            net_info.append("   [dim]Firewall rules may exist but require elevation to query.[/dim]")
+        else:
+            results["firewall"] = {"status": "error", "message": "No SSH firewall rule"}
+            issues.append(("No SSH firewall rule", "Windows Firewall blocks incoming SSH by default", f'New-NetFirewallRule -Name "SSH" -DisplayName "SSH" -Protocol TCP -LocalPort {ssh_port} -Action Allow -Enabled True'))
+            net_info.append("❌ Firewall: [red]No SSH rule found[/red]")
+            net_info.append("   [dim]Windows blocks all incoming by default. Must create allow rule.[/dim]")
+
+    console.print(Panel("\n".join(net_info), title="[bold]Network & Firewall[/bold]", border_style="blue"))
+
+    if issues:
+        fix_table = Table(title="Issues & Fixes", box=box.ROUNDED, show_lines=True, title_style="bold red")
+        fix_table.add_column("Issue", style="yellow", width=30)
+        fix_table.add_column("Impact", style="white", width=35)
+        fix_table.add_column("Fix Command", style="green", width=60)
+        for issue, impact, fix in issues:
+            fix_table.add_row(issue, impact, fix)
+        console.print(fix_table)
+
+        fix_script_path = Path(os.environ.get("TEMP", "C:/Temp")).joinpath("ssh_fix.ps1")
+        script_lines = ["# SSH Fix Script - Generated by ssh_debug_windows", f"# {len(issues)} issue(s) to fix", "# Run this script as Administrator", "", "$ErrorActionPreference = 'Stop'", ""]
+        for issue, _impact, fix in issues:
+            script_lines.append(f"# Fix: {issue}")
+            script_lines.append(f"Write-Host 'Fixing: {issue}' -ForegroundColor Yellow")
+            script_lines.append(fix)
+            script_lines.append("")
+        script_lines.append("Write-Host 'All fixes applied. Re-run ssh_debug_windows to verify.' -ForegroundColor Green")
+        fix_script_path.write_text("\n".join(script_lines), encoding="utf-8")
+
+        console.print(Panel(f"[bold yellow]⚠️  {len(issues)} issue(s) found[/bold yellow]\n\nFix script generated: [cyan]{fix_script_path}[/cyan]\nRun as Administrator: [green]powershell -ExecutionPolicy Bypass -File \"{fix_script_path}\"[/green]", title="[bold]Summary[/bold]", border_style="yellow"))
+    else:
+        conn_info = f"👤 {current_user}  🖥️  {hostname}  🔌 :{ssh_port}"
+        if ip_addresses:
+            conn_info += f"\n\n[bold]Connect:[/bold] ssh {current_user}@{ip_addresses[0]}"
+        console.print(Panel(f"[bold green]✅ All checks passed[/bold green]\n\n{conn_info}", title="[bold]Ready[/bold]", border_style="green"))
+
+    return results
+
+
+if __name__ == "__main__":
+    ssh_debug_windows()

machineconfig/scripts/python/helpers/helpers_network/ssh/ssh_debug_windows_utils.py

@@ -0,0 +1,34 @@
+from pathlib import Path
+import subprocess
+
+
+def run_powershell(cmd: str) -> tuple[bool, str]:
+    result = subprocess.run(["powershell", "-Command", cmd], capture_output=True, text=True, check=False)
+    return result.returncode == 0, result.stdout.strip()
+
+
+def check_sshd_binary_exists() -> tuple[bool, str]:
+    sshd_locations = [
+        Path("C:/Windows/System32/OpenSSH/sshd.exe"),
+        Path("C:/Program Files/OpenSSH/sshd.exe"),
+        Path("C:/Program Files (x86)/OpenSSH/sshd.exe"),
+    ]
+    for loc in sshd_locations:
+        if loc.exists():
+            return True, str(loc)
+    ok, which_out = run_powershell("Get-Command sshd -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Source")
+    if ok and which_out:
+        return True, which_out
+    return False, ""
+
+
+def detect_openssh() -> tuple[str, Path | None, Path | None]:
+    capability_sshd = Path("C:/Windows/System32/OpenSSH/sshd.exe")
+    winget_sshd = Path("C:/Program Files/OpenSSH/sshd.exe")
+    programdata_config = Path("C:/ProgramData/ssh")
+    capability_config = Path("C:/ProgramData/ssh")
+    if capability_sshd.exists():
+        return ("capability", capability_sshd, capability_config)
+    if winget_sshd.exists():
+        return ("winget", winget_sshd, programdata_config)
+    return ("not_found", None, None)

machineconfig/scripts/python/{helpers_repos → helpers/helpers_repos}/action.py

@@ -1,7 +1,7 @@
-from machineconfig.scripts.python.helpers_repos.action_helper import GitAction, GitOperationResult, GitOperationSummary, print_git_operations_summary
+from machineconfig.scripts.python.helpers.helpers_repos.action_helper import GitAction, GitOperationResult, GitOperationSummary, print_git_operations_summary
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.accessories import randstr
-from machineconfig.scripts.python.helpers_repos.update import update_repository
+from machineconfig.scripts.python.helpers.helpers_repos.update import update_repository
 
 from typing import Optional, Dict, Any, List, cast
 import concurrent.futures
@@ -117,7 +117,7 @@ def perform_git_operations(repos_root: PathExtended, pull: bool, commit: bool, p
         operations_performed.append("push")
 
     # Collect all candidate paths first
-    paths = list(repos_root.search("*"))
+    paths = list(repos_root.glob("*"))
 
     def _process_path(a_path: PathExtended) -> Dict[str, Any]:
         """Worker that processes a single path and returns metadata and results."""

machineconfig/scripts/python/{helpers_repos → helpers/helpers_repos}/action_helper.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from machineconfig.utils.path_extended import PathExtended
+from pathlib import Path
 
 
 from dataclasses import dataclass
@@ -12,7 +12,7 @@ from rich.table import Table
 @dataclass
 class GitOperationResult:
     """Result of a git operation on a single repository."""
-    repo_path: PathExtended
+    repo_path: Path
     action: str
     success: bool
     message: str
@@ -52,7 +52,7 @@ class GitOperationSummary:
 
     def __post_init__(self):
         self.failed_operations: list[GitOperationResult] = []
-        self.repos_without_remotes: list[PathExtended] = []
+        self.repos_without_remotes: list[Path] = []
 
 
 def print_git_operations_summary(summary: GitOperationSummary, operations_performed: list[str]) -> None:

machineconfig/scripts/python/{helpers_repos → helpers/helpers_repos}/cloud_repo_sync.py

@@ -1,12 +1,27 @@
 
-from typing import Optional, Literal, Annotated
 
+from typing import Optional, Literal, Annotated
 import typer
+from machineconfig.utils.ssh_utils.abc import MACHINECONFIG_VERSION
+
+
+def get_tmp_file():
+    from pathlib import Path
+    import platform
+    from machineconfig.utils.accessories import randstr
+    name = randstr(8)
+    if platform.system() == "Windows":
+        suffix = "ps1"
+    else:
+        suffix = "sh"
+    tmp_file = Path.home().joinpath(f"tmp_results/tmp_files/{name}.{suffix}")
+    tmp_file.parent.mkdir(parents=True, exist_ok=True)
+    return tmp_file
 
 
 def main(
+    repo: Annotated[str, typer.Argument(..., help="Path to the local repository. Defaults to current working directory.")],
     cloud: Annotated[Optional[str], typer.Option(..., "--cloud", "-c", help="Cloud storage profile name. If not provided, uses default from config.")] = None,
-    repo: Annotated[Optional[str], typer.Option(..., "--repo", "-r", help="Path to the local repository. Defaults to current working directory.")] = None,
     message: Annotated[Optional[str], typer.Option(..., "--message", "-m", help="Commit message for local changes.")] = None,
     on_conflict: Annotated[Literal["ask", "a",
                                    "push-local-merge", "p",
@@ -29,6 +44,7 @@ def main(
         "remove-rclone-conflict": "remove-rclone-conflict",
     }
     on_conflict = on_conflict_mapper[on_conflict]
+    import platform
     import git
     from rich.console import Console
     from rich.panel import Panel
@@ -38,14 +54,18 @@ def main(
     from machineconfig.utils.source_of_truth import CONFIG_ROOT, DEFAULTS_PATH
     from machineconfig.utils.code import get_uv_command_executing_python_script
     from pathlib import Path
-    import platform
     import subprocess
     console = Console()
 
+    def _bash_single_quote(val: str) -> str:
+        return "'" + val.replace("'", "'\"'\"'") + "'"
+
+    def _ps_single_quote(val: str) -> str:
+        return "'" + val.replace("'", "''") + "'"
+
     if cloud is None:
         try:
             from machineconfig.utils.io import read_ini
-
             cloud_resolved = read_ini(DEFAULTS_PATH)["general"]["rclone_config_name"]
             console.print(Panel(f"⚠️  Using default cloud: `{cloud_resolved}` from {DEFAULTS_PATH}", title="Default Cloud", border_style="yellow"))
         except FileNotFoundError:
@@ -53,11 +73,12 @@ def main(
             return ""
     else:
         cloud_resolved = cloud
-    repo_local_root = PathExtended.cwd() if repo is None else PathExtended(repo).expanduser().absolute()
+    repo_local_root = PathExtended.cwd() if repo == "." else PathExtended(repo).expanduser().absolute()
     try:
         repo_local_obj = git.Repo(repo_local_root, search_parent_directories=True)
     except git.InvalidGitRepositoryError:
-        typer.echo(f"[red]Error:[/] The specified path '{repo_local_root}' is not a valid git repository.")
+        msg = typer.style("Error: ", fg=typer.colors.RED) + f"The specified path '{repo_local_root}' is not a valid git repository."
+        typer.echo(msg)
         typer.Exit(code=1)
         return ""
     repo_local_root = PathExtended(repo_local_obj.working_dir)  # cwd might have been in a sub directory of repo_root, so its better to redefine it.
@@ -80,43 +101,89 @@ def main(
     if repo_remote_obj.is_dirty():
         console.print(Panel(f"⚠️  WARNING: REMOTE REPOSITORY IS DIRTY\nLocation: {repo_remote_root}\nPlease commit or stash changes before proceeding.", title="Warning", border_style="yellow"))
 
-    script = f"""
+    message_resolved = "sync" if message is None or message.strip() == "" else message
+
+    repo_local_root_str = str(repo_local_root)
+    repo_remote_root_str = str(repo_remote_root)
+
+    script_bash = f"""
 echo ""
-echo 'echo -e "\\033[1;34m═════ COMMITTING LOCAL CHANGES ═════\\033[0m"'
-cd {repo_local_root}
+echo -e "\\033[1;34m═════ COMMITTING LOCAL CHANGES ═════\\033[0m"
+cd {_bash_single_quote(repo_local_root_str)}
 git status
-git add .
-git commit -am "{message}"
+git add -A
+if git diff --cached --quiet; then
+  echo "-> No staged changes to commit."
+else
+  git commit -m {_bash_single_quote(message_resolved)} || true
+fi
 echo ""
 echo ""
-echo 'echo -e "\\033[1;34m═════ PULLING LATEST FROM REMOTE ═════\\033[0m"'
-cd {repo_local_root}
-echo '-> Trying to removing originEnc remote from local repo if it exists.'
-# git remote remove originEnc
+echo -e "\\033[1;34m═════ PULLING LATEST FROM REMOTE ═════\\033[0m"
+cd {_bash_single_quote(repo_local_root_str)}
+echo "-> Trying to removing originEnc remote from local repo if it exists."
 git remote remove originEnc 2>/dev/null || true
-echo '-> Adding originEnc remote to local repo'
-git remote add originEnc {repo_remote_root}
-echo '-> Fetching originEnc remote.'
+echo "-> Adding originEnc remote to local repo"
+git remote add originEnc {_bash_single_quote(repo_remote_root_str)}
+echo "-> Fetching originEnc remote."
 git pull originEnc master
 
 """
 
+    script_powershell = f"""
+Write-Host ""
+Write-Host "═════ COMMITTING LOCAL CHANGES ═════" -ForegroundColor Blue
+Set-Location -LiteralPath {_ps_single_quote(repo_local_root_str)}
+git status
+git add -A
+git diff --cached --quiet
+if ($LASTEXITCODE -eq 0) {{
+    Write-Host "-> No staged changes to commit."
+}} else {{
+    git commit -m {_ps_single_quote(message_resolved)}
+    if ($LASTEXITCODE -ne 0) {{
+        Write-Host "-> Commit skipped/failed (continuing)."
+    }}
+}}
+
+Write-Host ""
+Write-Host ""
+Write-Host "═════ PULLING LATEST FROM REMOTE ═════" -ForegroundColor Blue
+Set-Location -LiteralPath {_ps_single_quote(repo_local_root_str)}
+Write-Host "-> Trying to remove originEnc remote from local repo if it exists."
+git remote remove originEnc 2>$null
+Write-Host "-> Adding originEnc remote to local repo"
+git remote add originEnc {_ps_single_quote(repo_remote_root_str)}
+Write-Host "-> Fetching originEnc remote."
+git pull originEnc master
+exit $LASTEXITCODE
+"""
+
+    script = script_powershell if platform.system() == "Windows" else script_bash
+
     if Path.home().joinpath("code/machineconfig").exists():
         uv_project_dir = f"""{str(Path.home().joinpath("code/machineconfig"))}"""
         uv_with = None
     else:
-        uv_with = ["machineconfig>=7.98"]
+        uv_with = [MACHINECONFIG_VERSION]
         uv_project_dir = None
 
-    import tempfile
-    shell_path = Path(tempfile.mkstemp(suffix=".ps1" if platform.system() == "Windows" else ".sh")[1])
+    shell_path = get_tmp_file()
     shell_path.write_text(script, encoding="utf-8")
-
-    command = f". {shell_path}"
     if platform.system() == "Windows":
-        completed = subprocess.run(["powershell", "-Command", command], capture_output=True, check=False, text=True)
+        completed = subprocess.run(
+            ["powershell", "-ExecutionPolicy", "Bypass", "-File", str(shell_path)],
+            capture_output=True,
+            check=False,
+            text=True,
+        )
     else:
-        completed = subprocess.run(command, shell=True, capture_output=True, check=False, text=True)
+        completed = subprocess.run(
+            ["bash", str(shell_path)],
+            capture_output=True,
+            check=False,
+            text=True,
+        )
     res = Response.from_completed_process(completed).capture().print()
 
     if res.is_successful(strict_err=True, strict_returcode=True):
@@ -134,31 +201,37 @@ git pull originEnc master
         option1 = "Delete remote copy and push local:"
         from machineconfig.utils.meta import lambda_to_python_script
         def func2(remote_repo: str, local_repo: str, cloud: str):
-            from machineconfig.scripts.python.helpers_repos.sync import delete_remote_repo_copy_and_push_local
+            from machineconfig.scripts.python.helpers.helpers_repos.sync import delete_remote_repo_copy_and_push_local
             delete_remote_repo_copy_and_push_local(remote_repo=remote_repo, local_repo=local_repo, cloud=cloud)
         program_1_py = lambda_to_python_script(lambda: func2(remote_repo=str(repo_remote_root), local_repo=str(repo_local_root), cloud=str(cloud_resolved)),
                                                         in_global=True, import_module=False)
         program1, _pyfile1 = get_uv_command_executing_python_script(python_script=program_1_py, uv_with=uv_with, uv_project_dir=uv_project_dir)
         # ================================================================================
+
         option2 = "Delete local repo and replace it with remote copy:"
-        program_2 = f"""
-rm -rfd {repo_local_root}
-mv {repo_remote_root} {repo_local_root}
-"""
+        if platform.system() == "Windows":
+            program_2 = f"""
+Remove-Item -LiteralPath {_ps_single_quote(repo_local_root_str)} -Recurse -Force -ErrorAction SilentlyContinue
+Move-Item -LiteralPath {_ps_single_quote(repo_remote_root_str)} -Destination {_ps_single_quote(repo_local_root_str)} -Force
+    """
+        else:
+            program_2 = f"""
+rm -rfd {_bash_single_quote(repo_local_root_str)}
+mv {_bash_single_quote(repo_remote_root_str)} {_bash_single_quote(repo_local_root_str)}
+    """
         if platform.system() in ["Linux", "Darwin"]:
             program_2 += """
 sudo chmod 600 $HOME/.ssh/*
 sudo chmod 700 $HOME/.ssh
 sudo chmod +x $HOME/dotfiles/scripts/linux -R
 """
-        import tempfile
-        shell_file_2 = Path(tempfile.mkstemp(suffix=".ps1" if platform.system() == "Windows" else ".sh")[1])
+        shell_file_2 = get_tmp_file()
         shell_file_2.write_text(program_2, encoding="utf-8")
 
         # ================================================================================
         option3 = "Inspect repos:"
         def func(repo_local_root: str, repo_remote_root: str):
-            from machineconfig.scripts.python.helpers_repos.sync import inspect_repos
+            from machineconfig.scripts.python.helpers.helpers_repos.sync import inspect_repos
             inspect_repos(repo_local_root=repo_local_root, repo_remote_root=repo_remote_root)
         # program_3_py = function_to_script(func=func, call_with_kwargs={"repo_local_root": str(repo_local_root), "repo_remote_root": str(repo_remote_root)})
         # shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, ve_path=None, executable=executable)
@@ -168,14 +241,24 @@ sudo chmod +x $HOME/dotfiles/scripts/linux -R
         # ================================================================================
 
         option4 = "Remove problematic rclone file from repo and replace with remote:"
-        program_4 = f"""
+        if platform.system() == "Windows":
+            program_4 = f"""
+Remove-Item -LiteralPath "$HOME/dotfiles/creds/rclone/rclone.conf" -Force -ErrorAction SilentlyContinue
+New-Item -ItemType Directory -Path "$HOME/dotfiles/creds/rclone" -Force | Out-Null
+Copy-Item -LiteralPath "$HOME/.config/machineconfig/remote/dotfiles/creds/rclone/rclone.conf" -Destination "$HOME/dotfiles/creds/rclone/rclone.conf" -Force
+Set-Location -LiteralPath "$HOME/dotfiles"
+git commit -am "finished merging"
+{program1}
+    """
+        else:
+            program_4 = f"""
 rm $HOME/dotfiles/creds/rclone/rclone.conf
 cp $HOME/.config/machineconfig/remote/dotfiles/creds/rclone/rclone.conf $HOME/dotfiles/creds/rclone
 cd $HOME/dotfiles
 git commit -am "finished merging"
 {program1}
-"""
-        shell_file_4 = Path(tempfile.mkstemp(suffix=".ps1" if platform.system() == "Windows" else ".sh")[1])
+    """
+        shell_file_4 = get_tmp_file()
         shell_file_4.write_text(program_4, encoding="utf-8")
         # ================================================================================
 
@@ -213,6 +296,6 @@ git commit -am "finished merging"
             case _:
                 raise ValueError(f"Unknown action: {on_conflict}")
         from machineconfig.utils.code import run_shell_script
-        run_shell_script(script=program_content)
+        run_shell_script(script=program_content, display_script=True, clean_env=False)
     return program_content
 

machineconfig/scripts/python/{helpers_repos → helpers/helpers_repos}/grource.py

@@ -169,7 +169,7 @@ def visualize(
         if platform.system() == "Windows":
             print(f"⚠️  Portable gource not found at {gource_exe}, installing...")
             install_gource_windows()
-            # Check again after installation
+            gource_exe = get_gource_executable()  # Re-fetch path after installation
             if gource_exe.exists():
                 print(f"✅ Gource installed successfully at: {gource_exe}")
                 gource_cmd: str = str(gource_exe)
@@ -177,7 +177,8 @@ def visualize(
                 print("❌ Installation failed, falling back to system gource")
                 raise typer.Exit(1)
         else:
-            raise FileNotFoundError(f"Gource executable not found at {gource_exe}. Please install gource using your package manager.")
+            print(f"❌ Error: Gource executable not found at {gource_exe}. Please install gource using your package manager.")
+            raise typer.Exit(1)
     else:
         gource_cmd = str(gource_exe)