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

machineconfig/scripts/python/helpers_network/address.py

@@ -0,0 +1,132 @@
+
+from typing import cast, Optional
+
+
+def get_all_ipv4_addresses() -> list[tuple[str, str]]:
+    import psutil
+    import socket
+    result: list[tuple[str, str]] = []
+    for iface, addrs in psutil.net_if_addrs().items():
+        for addr in addrs:
+            if addr.family == socket.AF_INET:
+                ip = addr.address
+                result.append((iface, ip))
+    return result
+
+
+def select_lan_ipv4(prefer_vpn: bool) -> Optional[str]:
+    """
+    Choose the best 'real LAN' IPv4:
+      - Excludes loopback/link-local and (by default) VPN/tunnel/container ifaces
+      - Prefers physical-looking ifaces (eth/en*/wlan/wl*)
+      - Prefers RFC1918 LANs: 192.168/16 > 10/8 > 172.16/12
+      - Requires interface is UP
+    Set prefer_vpn=True to allow tunnel/VPN ifaces to compete.
+    """
+
+    import ipaddress
+    import re
+    from collections.abc import Sequence
+    import psutil
+
+    # Down-rank or exclude: tunnels/VPNs/bridges/containers (add your own if needed)
+    VIRTUAL_IFACE_PAT = re.compile(
+        r"^(?:lo|loopback|docker\d*|br-.*|veth.*|virbr.*|bridge.*|"
+        r"vboxnet.*|vmnet.*|zt.*|ham.*|tailscale.*|wg\d*|utun\d*|llw\d*|awdl\d*|"
+        r"tun\d*|tap\d*|cloudflarewarp.*|warp.*)$",
+        re.IGNORECASE,
+    )
+
+    # Light preference for names that look like real NICs
+    PHYSICAL_IFACE_PAT = re.compile(
+        r"^(?:eth\d*|en\d*|enp.*|ens.*|eno.*|wlan\d*|wl.*|.*wifi.*|.*ethernet.*)$",
+        re.IGNORECASE,
+    )
+
+    # Known noisy CIDRs to avoid
+    NOISY_NETS: list[ipaddress.IPv4Network] = [
+        ipaddress.IPv4Network("100.64.0.0/10"),   # CGNAT (Tailscale/others)
+        ipaddress.IPv4Network("172.17.0.0/16"),   # docker0 default
+        ipaddress.IPv4Network("172.18.0.0/16"),
+        ipaddress.IPv4Network("172.19.0.0/16"),
+        ipaddress.IPv4Network("192.168.49.0/24"), # minikube default
+        ipaddress.IPv4Network("10.0.2.0/24"),     # VirtualBox NAT
+    ]
+
+    def _in_any(ip: ipaddress.IPv4Address, nets: Sequence[ipaddress.IPv4Network]) -> bool:
+        return any(ip in n for n in nets)
+
+    stats = psutil.net_if_stats()
+    best = None
+    best_score = -10**9
+    import socket
+    for iface, addrs in psutil.net_if_addrs().items():
+        st = stats.get(iface)
+        if not st or not st.isup:
+            continue
+
+        for a in addrs:
+            if a.family != socket.AF_INET or not a.address:
+                continue
+
+            ip_str = a.address
+            try:
+                ip = cast(ipaddress.IPv4Address, ipaddress.ip_address(ip_str))
+            except ValueError:
+                continue
+
+            # Exclude unusable classes
+            if ip.is_loopback or ip.is_link_local:  # 127.0.0.0/8, 169.254.0.0/16
+                continue
+
+            # Hard filter: if it looks virtual and we don't prefer VPNs, skip it
+            if not prefer_vpn and VIRTUAL_IFACE_PAT.match(iface):
+                continue
+
+            # Hard filter: known noisy subnets (docker, cgnat, etc.)
+            if _in_any(ip, NOISY_NETS) and not prefer_vpn:
+                continue
+
+            # Base score
+            score = 0
+
+            # Prefer physical-looking names
+            if PHYSICAL_IFACE_PAT.match(iface):
+                score += 200
+
+            # Broadcast present usually means L2 LAN (not point-to-point)
+            # (psutil puts it on the same entry as .broadcast)
+            if getattr(a, "broadcast", None):
+                score += 100
+
+            # Prefer private RFC1918; rank families
+            if ip.is_private:
+                # Order: 192.168.x.x > 10.x.x.x > 172.16-31.x.x
+                ip_net = ipaddress.IPv4Network((ip, 32), strict=False)
+                if ipaddress.IPv4Network("192.168.0.0/16").supernet_of(ip_net):
+                    score += 90
+                elif ipaddress.IPv4Network("10.0.0.0/8").supernet_of(ip_net):
+                    score += 70
+                elif ipaddress.IPv4Network("172.16.0.0/12").supernet_of(ip_net):
+                    score += 50
+            else:
+                # Public on a NIC is unusual for a home/office LAN
+                score -= 50
+
+            # Slight nudge by interface speed if known (>0 means psutil knows it)
+            # (Many tunnels report 0)
+            if getattr(st, "speed", 0) > 0:
+                score += 20
+
+            # Deterministic tie-breaker: prefer shorter iface name (eth0 over eth10)
+            score -= len(iface) * 0.01
+
+            if score > best_score:
+                best_score = score
+                best = ip_str
+
+    return best
+
+
+if __name__ == "__main__":
+    print(select_lan_ipv4(False) or "No LAN IPv4 found")

machineconfig/scripts/python/{nw → helpers_network}/devops_add_ssh_key.py

@@ -13,9 +13,9 @@ import typer
 console = Console()
 
 
-def get_add_ssh_key_script(path_to_key: PathExtended):
+def get_add_ssh_key_script(path_to_key: PathExtended) -> str:
     console.print(Panel("🔑 SSH KEY CONFIGURATION", title="[bold blue]SSH Setup[/bold blue]"))
-    if system() == "Linux":
+    if system() == "Linux" or system() == "Darwin":
         authorized_keys = PathExtended.home().joinpath(".ssh/authorized_keys")
         console.print(Panel(f"🐧 Linux SSH configuration\n📄 Authorized keys file: {authorized_keys}", title="[bold blue]System Info[/bold blue]"))
     elif system() == "Windows":
@@ -35,7 +35,7 @@ def get_add_ssh_key_script(path_to_key: PathExtended):
             program = ""
         else:
             console.print(Panel(f"➕ Adding new SSH key to authorized keys\n🔑 Key file: {path_to_key.name}", title="[bold blue]Action[/bold blue]"))
-            if system() == "Linux":
+            if system() == "Linux" or system() == "Darwin":
                 program = f"cat {path_to_key} >> ~/.ssh/authorized_keys"
             elif system() == "Windows":
                 program_path = LIBRARY_ROOT.joinpath("setup_windows/add-sshkey.ps1")
@@ -48,14 +48,14 @@ def get_add_ssh_key_script(path_to_key: PathExtended):
                 raise NotImplementedError
     else:
         console.print(Panel(f"📝 Creating new authorized_keys file\n🔑 Using key: {path_to_key.name}", title="[bold blue]Action[/bold blue]"))
-        if system() == "Linux":
+        if system() == "Linux" or system() == "Darwin":
             program = f"cat {path_to_key} > ~/.ssh/authorized_keys"
         else:
             program_path = LIBRARY_ROOT.joinpath("setup_windows/openssh-server_add-sshkey.ps1")
             program = PathExtended(program_path).expanduser().read_text(encoding="utf-8").replace('$sshfile=""', f'$sshfile="{path_to_key}"')
             console.print(Panel("🔧 Configured PowerShell script for Windows\n📝 Set key path in script", title="[bold blue]Configuration[/bold blue]"))
 
-    if system() == "Linux":
+    if system() == "Linux" or system() == "Darwin":
         program += """
 sudo chmod 700 ~/.ssh
 sudo chmod 644 ~/.ssh/authorized_keys
@@ -66,6 +66,16 @@ sudo service ssh --full-restart
     return program
 
 
+"""
+Common pitfalls: 
+🚫 Wrong line endings (LF/CRLF) in config files
+🌐 Network port conflicts (try 2222 -> 2223) between WSL and Windows
+sudo service ssh restart
+sudo service ssh status
+sudo nano /etc/ssh/sshd_config
+"""
+
+
 def main(pub_path: Annotated[Optional[str], typer.Argument(..., help="Path to the public key file")] = None,
          pub_choose: Annotated[bool, typer.Option(..., "--choose", "-c", help="Choose from available public keys in ~/.ssh")] = False,
          pub_val: Annotated[bool, typer.Option(..., "--paste", "-p", help="Paste the public key content manually")] = False,
@@ -127,6 +137,15 @@ def main(pub_path: Annotated[Optional[str], typer.Argument(..., help="Path to th
     console.print(Panel("🚀 SSH KEY AUTHORIZATION READY\nRun the generated script to apply changes", box=box.DOUBLE_EDGE, title_align="left"))
     from machineconfig.utils.code import run_shell_script
     run_shell_script(script=program)
+
+    import machineconfig.scripts.python.helpers_network.address as helper
+    res = helper.select_lan_ipv4(prefer_vpn=False)
+    if res is None:
+        console.print(Panel("❌ ERROR: Could not determine local LAN IPv4 address", title="[bold red]Error[/bold red]", border_style="red"))
+        raise typer.Exit(code=1)
+    local_ip_v4 = res
+
+    console.print(Panel(f"🌐 This computer is accessible at: {local_ip_v4}", title="[bold green]Network Info[/bold green]", border_style="green"))
     console.print(Panel("✅ SSH KEY AUTHORIZATION COMPLETED", box=box.DOUBLE_EDGE, title_align="left"))
 
 

machineconfig/scripts/python/{nw → helpers_network}/mount_nfs

@@ -5,7 +5,6 @@
 # mkdir ~/data/local
 # sudo mount -o nolock,noatime,nodiratime,proto=tcp,timeo=600,retrans=2,noac alex-p51s-5:/home/alex/data/local ./data/local
 
-uv run --python 3.14 --with "machineconfig>=6.81" python -m machineconfig.scripts.python.mount_nfs
 # Check if remote server is reachable and share folder exists
 if ! ping -c 1 "$remote_server" &> /dev/null; then
   echo "💥 Error: Remote server $remote_server is not reachable."

machineconfig/scripts/python/{nw → helpers_network}/mount_nfs.py

@@ -20,8 +20,8 @@ def main():
         tmp = choose_ssh_host(multi=False)
         assert isinstance(tmp, str)
         ssh = SSH(host=tmp, username=None, hostname=None, ssh_key_path=None, password=None, port=22, enable_compression=False)
-        default = f"{ssh.hostname}:{ssh.run_shell(command='echo $HOME', verbose_output=False, description='Get home directory', strict_stderr=False, strict_return_code=True).op}/data/share_nfs"
-        share_info = choose_from_options(msg="📂 Choose a share path:", options=[f"{ssh.hostname}:{item.split(' ')[0]}" for item in ssh.run_shell(command="cat /etc/exports", verbose_output=False, description='Get NFS exports', strict_stderr=False, strict_return_code=False).op.split("\n") if not item.startswith("#")] + [default], default=default, multi=False)
+        default = f"{ssh.hostname}:{ssh.run_shell_cmd_on_remote(command='echo $HOME', verbose_output=False, description='Get home directory', strict_stderr=False, strict_return_code=True).op}/data/share_nfs"
+        share_info = choose_from_options(msg="📂 Choose a share path:", options=[f"{ssh.hostname}:{item.split(' ')[0]}" for item in ssh.run_shell_cmd_on_remote(command="cat /etc/exports", verbose_output=False, description='Get NFS exports', strict_stderr=False, strict_return_code=False).op.split("\n") if not item.startswith("#")] + [default], default=default, multi=False)
         assert isinstance(share_info, str), f"❌ share_info must be a string. Got {type(share_info)}"
 
     remote_server = share_info.split(":")[0]

machineconfig/scripts/python/{nw → helpers_network}/mount_ssh.py

@@ -19,7 +19,7 @@ def main():
         tmp = choose_ssh_host(multi=False)
         assert isinstance(tmp, str)
         ssh = SSH(host=tmp, username=None, hostname=None, ssh_key_path=None, password=None, port=22, enable_compression=False)
-        share_info = f"{ssh.username}@{ssh.hostname}:{ssh.run_shell(command='echo $HOME', verbose_output=False, description='Get home directory', strict_stderr=False, strict_return_code=True).op}/data/share_ssh"
+        share_info = f"{ssh.username}@{ssh.hostname}:{ssh.run_shell_cmd_on_remote(command='echo $HOME', verbose_output=False, description='Get home directory', strict_stderr=False, strict_return_code=True).op}/data/share_ssh"
     else:
         ssh = SSH(host=share_info.split(":")[0], username=None, hostname=None, ssh_key_path=None, password=None, port=22, enable_compression=False)
 

machineconfig/scripts/python/{nw → helpers_network}/ssh_debug_linux.py

@@ -1,7 +1,7 @@
 
 
 from platform import system
-from machineconfig.utils.path_extended import PathExtended
+from pathlib import Path
 from rich.console import Console
 from rich.panel import Panel
 from rich import box
@@ -26,7 +26,7 @@ def ssh_debug_linux() -> dict[str, dict[str, str | bool]]:
     results: dict[str, dict[str, str | bool]] = {}
     issues_found: list[str] = []
     
-    ssh_dir = PathExtended.home().joinpath(".ssh")
+    ssh_dir = Path.home().joinpath(".ssh")
     authorized_keys = ssh_dir.joinpath("authorized_keys")
     
     console.print(Panel("🔐 Checking SSH directory and authorized_keys...", title="[bold blue]File Permissions[/bold blue]", border_style="blue"))
@@ -106,7 +106,7 @@ def ssh_debug_linux() -> dict[str, dict[str, str | bool]]:
     
     console.print(Panel("🔌 Checking SSH port and listening status...", title="[bold blue]Network Status[/bold blue]", border_style="blue"))
     
-    sshd_config_paths = [PathExtended("/etc/ssh/sshd_config"), PathExtended("/etc/sshd_config")]
+    sshd_config_paths = [Path("/etc/ssh/sshd_config"), Path("/etc/sshd_config")]
     sshd_config = None
     for config_path in sshd_config_paths:
         if config_path.exists():
@@ -236,7 +236,7 @@ def ssh_debug_linux() -> dict[str, dict[str, str | bool]]:
     
     console.print(Panel("🗂️  Checking for problematic files in /etc/...", title="[bold blue]System Files[/bold blue]", border_style="blue"))
     
-    hosts_deny = PathExtended("/etc/hosts.deny")
+    hosts_deny = Path("/etc/hosts.deny")
     if hosts_deny.exists():
         hosts_deny_content = hosts_deny.read_text(encoding="utf-8")
         active_lines = [line.strip() for line in hosts_deny_content.splitlines() if line.strip() and not line.strip().startswith("#")]
@@ -252,14 +252,14 @@ def ssh_debug_linux() -> dict[str, dict[str, str | bool]]:
         results["hosts_deny"] = {"status": "ok", "message": "/etc/hosts.deny does not exist", "action": ""}
         console.print(Panel("✅ /etc/hosts.deny not present", title="[bold green]OK[/bold green]", border_style="green"))
     
-    hosts_allow = PathExtended("/etc/hosts.allow")
+    hosts_allow = Path("/etc/hosts.allow")
     if hosts_allow.exists():
         results["hosts_allow"] = {"status": "ok", "message": "/etc/hosts.allow exists (check if needed)", "action": ""}
         console.print(Panel("ℹ️  /etc/hosts.allow exists\n💡 Ensure it allows SSH if using TCP wrappers", title="[bold blue]Info[/bold blue]", border_style="blue"))
     
     console.print(Panel("👤 Checking home directory permissions...", title="[bold blue]User Permissions[/bold blue]", border_style="blue"))
     
-    home_dir = PathExtended.home()
+    home_dir = Path.home()
     home_stat = os.stat(home_dir)
     home_perms = oct(home_stat.st_mode)[-3:]
     
@@ -294,7 +294,7 @@ def ssh_debug_linux() -> dict[str, dict[str, str | bool]]:
     
     console.print(Panel("📋 Checking SSH logs for errors...", title="[bold blue]Logs[/bold blue]", border_style="blue"))
     
-    log_files = [PathExtended("/var/log/auth.log"), PathExtended("/var/log/secure")]
+    log_files = [Path("/var/log/auth.log"), Path("/var/log/secure")]
     log_found = False
     for log_file in log_files:
         if log_file.exists():

machineconfig/scripts/python/{nw → helpers_network}/ssh_debug_windows.py

@@ -1,7 +1,7 @@
 
 
 from platform import system
-from machineconfig.utils.path_extended import PathExtended
+from pathlib import Path
 from rich.console import Console
 from rich.panel import Panel
 from rich import box
@@ -26,7 +26,7 @@ def ssh_debug_windows() -> dict[str, dict[str, str | bool]]:
     results: dict[str, dict[str, str | bool]] = {}
     issues_found: list[str] = []
     
-    ssh_dir = PathExtended.home().joinpath(".ssh")
+    ssh_dir = Path.home().joinpath(".ssh")
     authorized_keys = ssh_dir.joinpath("authorized_keys")
     
     console.print(Panel("🔐 Checking SSH directory and authorized_keys...", title="[bold blue]File Permissions[/bold blue]", border_style="blue"))
@@ -124,7 +124,7 @@ def ssh_debug_windows() -> dict[str, dict[str, str | bool]]:
     
     console.print(Panel("🔌 Checking SSH port and listening status...", title="[bold blue]Network Status[/bold blue]", border_style="blue"))
     
-    sshd_config_paths = [PathExtended("C:\\ProgramData\\ssh\\sshd_config"), PathExtended(os.environ.get("PROGRAMDATA", "C:\\ProgramData")).joinpath("ssh", "sshd_config")]
+    sshd_config_paths = [Path("C:\\ProgramData\\ssh\\sshd_config"), Path(os.environ.get("PROGRAMDATA", "C:\\ProgramData")).joinpath("ssh", "sshd_config")]
     sshd_config = None
     for config_path in sshd_config_paths:
         if config_path.exists():
@@ -168,7 +168,7 @@ def ssh_debug_windows() -> dict[str, dict[str, str | bool]]:
             if admin_authorized_keys_lines:
                 console.print(Panel("⚠️  IMPORTANT: Administrators group uses different authorized_keys location\n💡 For admin users, keys should be in: C:\\ProgramData\\ssh\\administrators_authorized_keys\n💡 Not in user's .ssh/authorized_keys!", title="[bold yellow]Admin Users[/bold yellow]", border_style="yellow"))
                 
-                programdata_auth_keys = PathExtended(os.environ.get("PROGRAMDATA", "C:\\ProgramData")).joinpath("ssh", "administrators_authorized_keys")
+                programdata_auth_keys = Path(os.environ.get("PROGRAMDATA", "C:\\ProgramData")).joinpath("ssh", "administrators_authorized_keys")
                 if programdata_auth_keys.exists():
                     console.print(Panel("✅ administrators_authorized_keys file exists", title="[bold green]OK[/bold green]", border_style="green"))
                 else:

machineconfig/scripts/python/{nw → helpers_network}/wifi_conn.py

@@ -28,8 +28,6 @@ Usage examples:
 
 """
 
-from typing import Annotated
-import typer
 import configparser
 from pathlib import Path
 import os
@@ -38,8 +36,7 @@ import subprocess
 import getpass
 from typing import List, Dict, Optional
 from rich.console import Console
-from rich.panel import Panel
-from rich.prompt import Prompt, Confirm
+from rich.prompt import Prompt
 from rich.table import Table
 
 console = Console()
@@ -263,51 +260,6 @@ def manual_network_selection() -> bool:
         return False
 
 
-def main(
-    ssid: Annotated[str, typer.Option("-n", "--ssid", help="🔗 SSID of WiFi (from config)")] = "MyPhoneHotSpot",
-    manual: Annotated[bool, typer.Option("-m", "--manual", help="🔍 Manual network selection mode")] = False,
-    list_: Annotated[bool, typer.Option("-l", "--list", help="📡 List available networks only")] = False,
-) -> None:
-    """Main function with fallback network selection"""
-    console.print(Panel("📶 Welcome to the WiFi Connector Tool", title="[bold blue]WiFi Connection[/bold blue]", border_style="blue"))
-
-    # If user just wants to list networks
-    if list_:
-        display_available_networks()
-        return
-
-    # If user wants manual mode, skip config and go straight to selection
-    if manual:
-        console.print("[blue]🔍 Manual network selection mode[/blue]")
-        if manual_network_selection():
-            console.print("[green]🎉 Successfully connected![/green]")
-        else:
-            console.print("[red]❌ Failed to connect[/red]")
-        return
-
-    # Try to connect using configuration first
-    console.print(f"[blue]🔍 Attempting to connect to configured network: {ssid}[/blue]")
-
-    if try_config_connection(ssid):
-        console.print("[green]🎉 Successfully connected using configuration![/green]")
-        return
-
-    # Configuration failed, offer fallback options
-    console.print("\n[yellow]⚠️  Configuration connection failed or not available[/yellow]")
-
-    if Confirm.ask("[blue]Would you like to manually select a network?[/blue]", default=True):
-        if manual_network_selection():
-            console.print("[green]🎉 Successfully connected![/green]")
-        else:
-            console.print("[red]❌ Failed to connect[/red]")
-    else:
-        console.print("[blue]👋 Goodbye![/blue]")
-
-
-def arg_parser() -> None:
-    typer.run(main)
-
-
 def get_current_wifi_name() -> str:
     """Get the name of the currently connected WiFi network"""
     console.print("\n[blue]🔍 Checking current WiFi connection...[/blue]")
@@ -412,7 +364,3 @@ def create_new_connection(name: str, ssid: str, password: str):
     except Exception as e:
         console.print(f"[red]❌ Unexpected error: {e}[/red]")
         raise
-
-
-if __name__ == "__main__":
-    arg_parser()

machineconfig/scripts/python/{nw → helpers_network}/wsl_windows_transfer.py

@@ -35,15 +35,16 @@ def main(
     print("=" * 50 + "\n")
 
     path_obj = PathExtended(path).expanduser().absolute()
+    relative_home = PathExtended(path_obj.expanduser().absolute().relative_to(Path.home()))
 
     if same_file_system:
         print("⚠️ Using a not recommended transfer method! Copying files across the same file system.")
         if system == "Windows":  # move files over to WSL
             print("📤 Transferring files from Windows to WSL...")
-            path_obj.copy(folder=WSL_FROM_WIN.joinpath(UserName).joinpath(path_obj.rel2home().parent), overwrite=True)  # the following works for files and folders alike.
+            path_obj.copy(folder=WSL_FROM_WIN.joinpath(UserName).joinpath(relative_home.parent), overwrite=True)  # the following works for files and folders alike.
         else:  # move files from WSL to win
             print("📤 Transferring files from WSL to Windows...")
-            path_obj.copy(folder=WIN_FROM_WSL.joinpath(UserName).joinpath(path_obj.rel2home().parent), overwrite=True)
+            path_obj.copy(folder=WIN_FROM_WSL.joinpath(UserName).joinpath(relative_home.parent), overwrite=True)
         print("✅ Transfer completed successfully!\n")
     else:
         from machineconfig.utils.ssh import SSH

machineconfig/scripts/python/helpers_repos/clone.py

@@ -1,4 +1,3 @@
-from __future__ import annotations
 
 from pathlib import Path
 from typing import Literal, Optional, cast

machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -1,28 +1,47 @@
-import git
-from rich.console import Console
-from rich.panel import Panel
-import typer
 
-from machineconfig.utils.path_extended import PathExtended
-from machineconfig.utils.terminal import Response
-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
 from typing import Optional, Literal, Annotated
 
-
-console = Console()
+import typer
 
 
 def main(
     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", "push-local-merge", "overwrite-local", "stop-on-conflict", "remove-rclone-conflict"], typer.Option(..., "--on-conflict", "-oc", help="Action to take on merge conflict. Default is 'ask'.")] = "ask",
+    on_conflict: Annotated[Literal["ask", "a",
+                                   "push-local-merge", "p",
+                                   "overwrite-local", "o",
+                                   "stop-on-conflict", "s",
+                                   "remove-rclone-conflict", "r"
+                                   ], typer.Option(..., "--on-conflict", "-o", help="Action to take on merge conflict. Default is 'ask'.")] = "ask",
     pwd: Annotated[Optional[str], typer.Option(..., "--password", help="Password for encryption/decryption of the remote repository.")] = None,
 ):
+    on_conflict_mapper: dict[str, Literal["ask", "push-local-merge", "overwrite-local", "stop-on-conflict", "remove-rclone-conflict"]] = {
+        "a": "ask",
+        "ask": "ask",
+        "p": "push-local-merge",
+        "push-local-merge": "push-local-merge",
+        "o": "overwrite-local",
+        "overwrite-local": "overwrite-local",
+        "s": "stop-on-conflict",
+        "stop-on-conflict": "stop-on-conflict",
+        "r": "remove-rclone-conflict",
+        "remove-rclone-conflict": "remove-rclone-conflict",
+    }
+    on_conflict = on_conflict_mapper[on_conflict]
+    import git
+    from rich.console import Console
+    from rich.panel import Panel
+
+    from machineconfig.utils.path_extended import PathExtended
+    from machineconfig.utils.terminal import Response
+    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()
+
     if cloud is None:
         try:
             from machineconfig.utils.io import read_ini
@@ -35,10 +54,16 @@ def main(
     else:
         cloud_resolved = cloud
     repo_local_root = PathExtended.cwd() if repo is None else PathExtended(repo).expanduser().absolute()
-    repo_local_obj = git.Repo(repo_local_root, search_parent_directories=True)
+    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.")
+        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.
+    local_relative_home = PathExtended(repo_local_root.expanduser().absolute().relative_to(Path.home()))
     PathExtended(CONFIG_ROOT).joinpath("remote").mkdir(parents=True, exist_ok=True)
-    repo_remote_root = PathExtended(CONFIG_ROOT).joinpath("remote", repo_local_root.rel2home())
+    repo_remote_root = PathExtended(CONFIG_ROOT).joinpath("remote", local_relative_home)
     repo_remote_root.delete(sure=True)
     try:
         console.print(Panel("📥 DOWNLOADING REMOTE REPOSITORY", title_align="left", border_style="blue"))
@@ -80,7 +105,7 @@ git pull originEnc master
         uv_project_dir = f"""{str(Path.home().joinpath("code/machineconfig"))}"""
         uv_with = None
     else:
-        uv_with = ["machineconfig>=6.81"]
+        uv_with = ["machineconfig>=7.98"]
         uv_project_dir = None
 
     import tempfile
@@ -111,7 +136,8 @@ git pull originEnc master
         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
             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)
+        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:"
@@ -136,7 +162,8 @@ sudo chmod +x $HOME/dotfiles/scripts/linux -R
             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)
-        program_3_py = lambda_to_python_script(lambda: func(repo_local_root=str(repo_local_root), repo_remote_root=str(repo_remote_root)), in_global=True, import_module=False)
+        program_3_py = lambda_to_python_script(lambda: func(repo_local_root=str(repo_local_root), repo_remote_root=str(repo_remote_root)),
+                                                        in_global=True, import_module=False)
         program3, _pyfile3 = get_uv_command_executing_python_script(python_script=program_3_py, uv_with=uv_with, uv_project_dir=uv_project_dir)
         # ================================================================================
 

machineconfig/scripts/python/helpers_repos/entrypoint.py

@@ -38,7 +38,8 @@ def resolve_spec_path(directory: Optional[str], cloud: Optional[str]) -> Path:
     repos_root = resolve_directory(directory)
     from machineconfig.utils.path_extended import PathExtended
     if not repos_root.exists() or repos_root.name != "repos.json":
-        candidate = Path(CONFIG_ROOT).joinpath("repos").joinpath(PathExtended(repos_root).rel2home()).joinpath("repos.json")
+        relative_repos_root = PathExtended(repos_root).expanduser().absolute().relative_to(Path.home())
+        candidate = Path(CONFIG_ROOT).joinpath("repos").joinpath(relative_repos_root).joinpath("repos.json")
         repos_root = candidate
         if not repos_root.exists():
             cloud_name: Optional[str]

machineconfig/scripts/python/helpers_repos/grource.py

@@ -100,7 +100,7 @@ def install_gource_windows(version: Optional[str] = None) -> None:
 
 
 def visualize(
-    repo: Annotated[str, typer.Option("--repo", "-r", help="Path to git repository to visualize")] = Path.cwd().__str__(),
+    repo: Annotated[str, typer.Option("--repo", "-r", help="Path to git repository to visualize")] = ".",
     output_file: Annotated[Optional[Path], typer.Option("--output", "-o", help="Output video file (e.g., output.mp4). If specified, gource will render to video.")] = None,
     resolution: Annotated[str, typer.Option("--resolution", "-res", help="Video resolution (e.g., 1920x1080, 1280x720)")] = "1920x1080",
     seconds_per_day: Annotated[float, typer.Option("--seconds-per-day", "-spd", help="Speed of simulation (lower = faster)")] = 0.1,

machineconfig/scripts/python/helpers_repos/record.py

@@ -242,7 +242,8 @@ def main_record(repos_root: Path):
     tree_structure = build_tree_structure(repo_records, repos_root)
     print(tree_structure)
 
-    save_path = CONFIG_ROOT.joinpath("repos").joinpath(repos_root.rel2home()).joinpath("repos.json")
+    relative_repos_root = PathExtended(repos_root).expanduser().absolute().relative_to(Path.home())
+    save_path = CONFIG_ROOT.joinpath("repos").joinpath(relative_repos_root).joinpath("repos.json")
     save_json(obj=res, path=save_path, indent=4)
     pprint(f"📁 Result saved at {PathExtended(save_path)}")
     print(">>>>>>>>> Finished Recording")