machineconfig 5.38__tar.gz → 5.40__tar.gz

{machineconfig-5.38/src/machineconfig.egg-info → machineconfig-5.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.38
+Version: 5.40
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -26,6 +26,7 @@ Requires-Dist: rclone-python>=0.1.23
 Requires-Dist: pyjson5>=1.6.9
 Requires-Dist: questionary>=2.1.1
 Requires-Dist: typer-slim>=0.19.2
+Requires-Dist: euporie>=2.8.14
 Provides-Extra: windows
 Requires-Dist: pywin32; extra == "windows"
 Provides-Extra: plot

{machineconfig-5.38 → machineconfig-5.40}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "5.38"
+version = "5.40"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -35,6 +35,7 @@ dependencies = [
     "pyjson5>=1.6.9",
     "questionary>=2.1.1",
     "typer-slim>=0.19.2",
+    "euporie>=2.8.14",
 ]
 
 [project.optional-dependencies]
@@ -92,10 +93,12 @@ dev = [
     "ipdb>=0.13.13",
     "ipykernel>=6.30.1",
     "ipython>=9.5.0",
+    "marimo>=0.16.5",
     "matplotlib>=3.10.6",
     "mypy>=1.18.2",
     "nuitka>=2.7.16",
     "numpy>=2.3.3",
+    "pandas>=2.3.3",
     "plotly>=6.3.0",
     "polars>=1.33.1",
     "pre-commit>=4.3.0",

{machineconfig-5.38 → machineconfig-5.40}/src/machineconfig/cluster/sessions_managers/zellij_utils/process_monitor.py

@@ -53,7 +53,7 @@ class ProcessMonitor:
         command = tab_config["command"]
         try:
             check_script = self._create_process_check_script(command)
-            remote_cmd = f"$HOME/code/machineconfig/.venv/bin/python -c {shlex.quote(check_script)}"
+            remote_cmd = f"$HOME/.local/bin devops self run-python -c {shlex.quote(check_script)}"
             result = self.remote_executor.run_command(remote_cmd, timeout=15)
             if result.returncode == 0:
                 try:
@@ -143,7 +143,7 @@ if __name__ == "__main__":
             check_timestamp = timestamp_result.stdout.strip() if timestamp_result.returncode == 0 else "unknown"
 
             check_script = self._create_fresh_check_script(command)
-            remote_cmd = f"$HOME/code/machineconfig/.venv/bin/python -c {shlex.quote(check_script)}"
+            remote_cmd = f"$HOME/.local/bin/devops self run-python -c {shlex.quote(check_script)}"
             result = self.remote_executor.run_command(remote_cmd, timeout=15)
 
             if result.returncode == 0:

{machineconfig-5.38 → machineconfig-5.40}/src/machineconfig/jobs/installer/check_installations.py

@@ -1,9 +1,9 @@
 
 import platform
-from machineconfig.utils.source_of_truth import LIBRARY_ROOT
+from machineconfig.utils.source_of_truth import CONFIG_ROOT
 
 
-APP_SUMMARY_PATH = LIBRARY_ROOT.joinpath(f"profile/records/{platform.system().lower()}/apps_summary_report.csv")
+APP_SUMMARY_PATH = CONFIG_ROOT.joinpath(f"profile/records/{platform.system().lower()}/apps_summary_report.csv")
 # CLOUD: str = "gdw"  # Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
 # # my onedrive doesn't allow sharing.
 

machineconfig-5.40/src/machineconfig/profile/create_helper.py

@@ -0,0 +1,26 @@
+
+from typing import Literal
+from machineconfig.utils.source_of_truth import LIBRARY_ROOT, CONFIG_ROOT
+
+
+def copy_assets_to_machine(which: Literal["scripts", "settings"]):
+    # callers, symlink public, shell profile adder (requires init.ps1 and scripts dir to be present on machine)
+    import platform
+    if platform.system().lower() == "windows":
+        system = "windows"
+    elif platform.system().lower() == "linux" or platform.system().lower() == "darwin":
+        system = "linux"
+    else:
+        raise NotImplementedError(f"System {platform.system().lower()} not supported")
+    match which:
+        case "scripts":
+            source = LIBRARY_ROOT.joinpath("scripts", system)
+            target = CONFIG_ROOT.joinpath("scripts", system)
+        case "settings":
+            source = LIBRARY_ROOT.joinpath("settings", system)
+            target = CONFIG_ROOT.joinpath("settings", system)
+    from machineconfig.utils.path_extended import PathExtended
+    PathExtended(source).copy(folder=target.parent, overwrite=True)
+    PathExtended(source).copy(folder=target.parent, overwrite=True)
+
+

machineconfig-5.38/src/machineconfig/profile/create.py → machineconfig-5.40/src/machineconfig/profile/create_links.py

@@ -13,7 +13,7 @@ from rich.table import Table
 
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.links import symlink_map, copy_map
-from machineconfig.utils.source_of_truth import LIBRARY_ROOT, CONFIG_PATH
+from machineconfig.utils.source_of_truth import LIBRARY_ROOT, CONFIG_ROOT
 
 import platform
 import subprocess
@@ -63,7 +63,7 @@ def read_mapper() -> MapperFileData:
                 "contents": file_base.get("contents"),
                 "copy": file_base.get("copy"),
             }
-            if "LIBRARY_ROOT" in file_map["self_managed_config_file_path"]:
+            if "CONFIG_ROOT" in file_map["self_managed_config_file_path"]:
                 if program_key not in public:
                     public[program_key] = []
                 public[program_key].append(file_map)
@@ -107,7 +107,7 @@ def apply_mapper(mapper_data: dict[str, list[ConfigMapper]],
         console.rule(f"🔄 Processing [bold]{program_name}[/] symlinks", style="cyan")
         for a_mapper in program_files:
             config_file_default_path = PathExtended(a_mapper["config_file_default_path"])
-            self_managed_config_file_path = PathExtended(a_mapper["self_managed_config_file_path"].replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix()))
+            self_managed_config_file_path = PathExtended(a_mapper["self_managed_config_file_path"].replace("CONFIG_ROOT", CONFIG_ROOT.as_posix()))
             
             # Determine whether to use copy or symlink
             use_copy = method == "copy" or a_mapper.get("copy", False)
@@ -215,7 +215,7 @@ def apply_mapper(mapper_data: dict[str, list[ConfigMapper]],
 
     if system == "Linux":
         console.print("\n[bold]📜 Setting executable permissions for scripts...[/bold]")
-        subprocess.run(f"chmod +x {LIBRARY_ROOT.joinpath(f'scripts/{system.lower()}')} -R", shell=True, capture_output=True, text=True)
+        subprocess.run(f"chmod +x {CONFIG_ROOT.joinpath(f'scripts/{system.lower()}')} -R", shell=True, capture_output=True, text=True)
         console.print("[green]✅ Script permissions updated[/green]")
 
     # Display operation summary table
@@ -250,8 +250,8 @@ def apply_mapper(mapper_data: dict[str, list[ConfigMapper]],
         # Export operation records to CSV
         import csv
         from datetime import datetime
-        
-        csv_dir = PathExtended(CONFIG_PATH).joinpath("symlink_operations")
+
+        csv_dir = PathExtended(CONFIG_ROOT).joinpath("symlink_operations")
         csv_dir.mkdir(parents=True, exist_ok=True)
         
         timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")

machineconfig-5.38/src/machineconfig/profile/create_frontend.py → machineconfig-5.40/src/machineconfig/profile/create_links_export.py

@@ -1,7 +1,6 @@
 
 import typer
 from typing import Optional, Literal
-from pathlib import Path
 
 
 def main_public_from_parser(method: Literal["symlink", "copy"] = typer.Option(..., help="Method to use for setting up the config file."),
@@ -12,12 +11,7 @@ def main_public_from_parser(method: Literal["symlink", "copy"] = typer.Option(..
     SOURCE = Self-Managed-Config-File-Path
     TARGET = Config-File-Default-Path
     For public config files, the source always exists, because we know it comes from machineconfig repo."""
-    from machineconfig.profile.create import ConfigMapper, read_mapper
-    if method == "symlink":
-        machineconfig_repo_path = Path.home().joinpath("code/machineconfig")
-        if not machineconfig_repo_path.exists() or not machineconfig_repo_path.is_dir():
-            raise FileNotFoundError(f"machineconfig repo not found at {machineconfig_repo_path}. Cannot create symlinks to non-existing source files.")
-
+    from machineconfig.profile.create_links import ConfigMapper, read_mapper
     mapper_full = read_mapper()["public"]
     if which is None:
         assert interactive is True
@@ -31,7 +25,9 @@ def main_public_from_parser(method: Literal["symlink", "copy"] = typer.Option(..
             items_chosen = which.split(",")
     items_objections: dict[str, list[ConfigMapper]] = {item: mapper_full[item] for item in items_chosen if item in mapper_full}
 
-    from machineconfig.profile.create import apply_mapper
+    from machineconfig.profile.create_links import apply_mapper
+    from machineconfig.profile.create_helper import copy_assets_to_machine
+    copy_assets_to_machine(which="settings")  # config files live here and will be linked to.
     apply_mapper(mapper_data=items_objections, on_conflict=on_conflict, method=method)
 
 
@@ -39,7 +35,7 @@ def main_private_from_parser(method: Literal["symlink", "copy"] = typer.Option(.
                              on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"] = typer.Option("throwError", help="Action to take on conflict"),
                              which: Optional[str] = typer.Option(None, help="Specific items to process"),
                              interactive: bool = typer.Option(False, help="Run in interactive mode")):
-    from machineconfig.profile.create import ConfigMapper, read_mapper
+    from machineconfig.profile.create_links import ConfigMapper, read_mapper
 
     mapper_full = read_mapper()["private"]
     if which is None:
@@ -54,5 +50,5 @@ def main_private_from_parser(method: Literal["symlink", "copy"] = typer.Option(.
             items_chosen = which.split(",")
     items_objections: dict[str, list[ConfigMapper]] = {item: mapper_full[item] for item in items_chosen if item in mapper_full}
 
-    from machineconfig.profile.create import apply_mapper
+    from machineconfig.profile.create_links import apply_mapper
     apply_mapper(mapper_data=items_objections, on_conflict=on_conflict, method=method)

machineconfig-5.38/src/machineconfig/profile/shell.py → machineconfig-5.40/src/machineconfig/profile/create_shell_profile.py

@@ -1,8 +1,7 @@
 """shell"""
 
-from typing import Literal
 from machineconfig.utils.path_extended import PathExtended
-from machineconfig.utils.source_of_truth import LIBRARY_ROOT, CONFIG_PATH
+from machineconfig.utils.source_of_truth import CONFIG_ROOT
 
 import platform
 import os
@@ -36,51 +35,27 @@ def get_shell_profile_path() -> PathExtended:
     return profile_path
 
 
-def create_default_shell_profile(method: Literal["copy", "reference"]) -> None:
-    if method == "reference":
-        machineconfig_repo_path = PathExtended.home().joinpath("code/machineconfig")
-        if not machineconfig_repo_path.exists() or not machineconfig_repo_path.is_dir():
-            raise FileNotFoundError(f"machineconfig repo not found at {machineconfig_repo_path}. Cannot create symlinks to non-existing source files.")
-
+def create_default_shell_profile() -> None:
     shell_profile_path = get_shell_profile_path()
     shell_profile = shell_profile_path.read_text(encoding="utf-8")
 
-    if system == "Windows":
-        init_script = PathExtended(LIBRARY_ROOT).joinpath("settings/shells/pwsh/init.ps1")
-
-        init_script_copy_path = PathExtended(CONFIG_PATH).joinpath("profile/init.ps1").collapseuser()
-        init_script_copy_path.parent.mkdir(parents=True, exist_ok=True)
-        init_script.copy(path=init_script_copy_path, overwrite=True)
+    from machineconfig.profile.create_helper import copy_assets_to_machine
+    copy_assets_to_machine("settings")  # init.ps1 or init.sh live here
+    copy_assets_to_machine("scripts")  # init scripts are going to reference those scripts.
 
-        source_using_copy = f""". {str(init_script_copy_path).replace("~", "$HOME")}"""
-        source_using_reference = f""". {str(init_script.collapseuser()).replace("~", "$HOME")}"""
+    if system == "Windows":
+        init_script = PathExtended(CONFIG_ROOT).joinpath("settings/shells/pwsh/init.ps1")
+        source_line = f""". {str(init_script.collapseuser()).replace("~", "$HOME")}"""
     else:
-        init_script = PathExtended(LIBRARY_ROOT).joinpath("settings/shells/bash/init.sh")
-        init_script_copy_path = PathExtended(CONFIG_PATH).joinpath("profile/init.sh").collapseuser()
-        init_script_copy_path.parent.mkdir(parents=True, exist_ok=True)
-        init_script.copy(path=init_script_copy_path, overwrite=True)
-
-        source_using_reference = f"""source {str(init_script.collapseuser()).replace("~", "$HOME")}"""
-        source_using_copy = f"""source {str(init_script_copy_path).replace("~", "$HOME")}"""
-
-    match method:
-        case "copy":
-            line_of_interest = source_using_copy
-            line_other = source_using_reference
-        case "reference":
-            line_of_interest = source_using_reference
-            line_other = source_using_copy
+        init_script = PathExtended(CONFIG_ROOT).joinpath("settings/shells/bash/init.sh")
+        source_line = f"""source {str(init_script).replace("~", "$HOME")}"""
 
     was_shell_updated = False
-    if line_other in shell_profile:  # always remove this irrelevant line
-        shell_profile = shell_profile.replace(line_other, "")
-        was_shell_updated = True
-
-    if line_of_interest in shell_profile:
+    if source_line in shell_profile:
         console.print(Panel("🔄 PROFILE | Skipping init script sourcing - already present in profile", title="[bold blue]Profile[/bold blue]", border_style="blue"))        
     else:
         console.print(Panel("📝 PROFILE | Adding init script sourcing to profile", title="[bold blue]Profile[/bold blue]", border_style="blue"))
-        shell_profile += "\n" + line_of_interest + "\n"
+        shell_profile += "\n" + source_line + "\n"
         if system == "Linux":
             result = subprocess.run(["cat", "/proc/version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, check=False)
             if result.returncode == 0 and result.stdout:

{machineconfig-5.38 → machineconfig-5.40}/src/machineconfig/scripts/linux/z_ls

@@ -40,11 +40,11 @@ fi
 if [[ "${ZJ_SESSIONS}" == *"(current)"* ]]; then
     # if so, then we are in a zellijsession
     echo "already inside a session, existing."
-    COMMANDS=$(ls $HOME/code/machineconfig/src/machineconfig/settings/zellij/commands)
+    COMMANDS=$(ls $HOME/.config/machineconfig/settings/zellij/commands)
     # fzf the results
     res="$(echo -e "${COMMANDS}" | fzf --ansi)"
     # run the bash fiZJ_SESSIONSle chosen
-    bash $HOME/code/machineconfig/src/machineconfig/settings/zellij/commands/$res
+    bash $HOME/.config/machineconfig/settings/zellij/commands/$res
 
 else # ==> we are not in a zellijsession
   if [ "${NO_SESSIONS}" -ge 1 ]; then  # sessions do exist

{machineconfig-5.38 → machineconfig-5.40}/src/machineconfig/scripts/python/agents.py

@@ -103,7 +103,6 @@ def create(
     layoutfile = get_agents_launch_layout(session_root=agents_dir)    
     regenerate_py_code = f"""
 #!/usr/bin/env uv run --python 3.13 --with machineconfig
-#!/usr/bin/env uv run --no-dev --project $HOME/code/machineconfig
 fire_agents create --context-path "{prompt_material_path}" \\
     --{search_strategy} "{context_path or keyword_search or filename_pattern}" \\
     --prompt-path "{prompt_path or ''}" \\

{machineconfig-5.38 → machineconfig-5.40}/src/machineconfig/scripts/python/ai/initai.py

@@ -23,12 +23,11 @@ uv init --python 3.13
 uv venv
 uv add --upgrade-package pylint pyright mypy pyrefly ty --dev  # linters and type checkers
 uv add --upgrade-package pytest --dev
-# uv add typer --dev
+uv add typer --dev
 
 """
-            import subprocess
-
-            subprocess.run(command_to_run, shell=True, check=True)
+            from machineconfig.utils.code import run_shell_script
+            run_shell_script(command_to_run)
         else:
             print("Terminating initai ...")
             return

{machineconfig-5.38 → machineconfig-5.40}/src/machineconfig/scripts/python/ai/scripts/lint_and_type_check.ps1

@@ -66,7 +66,6 @@ uv run -m cleanpy .
 uv run -m ruff clean
 # uv run -m ruff format .
 uv run -m ruff check . --fix
-uv run --no-dev --project $HOME/code/machineconfig -m machineconfig.scripts.python.ai.generate_files
 
 New-Item -ItemType Directory -Force -Path .ai/linters | Out-Null
 

{machineconfig-5.38 → machineconfig-5.40}/src/machineconfig/scripts/python/ai/scripts/lint_and_type_check.sh

@@ -70,7 +70,6 @@ uv run -m cleanpy .
 uv run -m ruff clean
 # uv run -m ruff format .
 uv run -m ruff check . --fix
-uv run --no-dev --project $HOME/code/machineconfig -m machineconfig.scripts.python.ai.generate_files
 
 mkdir .ai/linters
 

{machineconfig-5.38 → machineconfig-5.40}/src/machineconfig/scripts/python/croshell.py

@@ -142,7 +142,14 @@ from pathlib import Path
     else:
         if interpreter == "ipython": profile = f" --profile {ipython_profile} --no-banner"
         else: profile = ""
-        if local: ve_line = "--project $HOME/code/machineconfig"
+        if local:
+            from machineconfig.utils.source_of_truth import LIBRARY_ROOT
+            repo_root = LIBRARY_ROOT.parent.parent
+            if repo_root.parent.name == "code" and repo_root.name == "machineconfig" and repo_root.exists() and repo_root.is_dir():
+                ve_line = f"--project {str(repo_root)}"
+            else:
+                console.print(Panel("❌ Could not determine the local machineconfig repo root. Please ensure the `REPO_ROOT` in `source_of_truth.py` is correctly set to the local path of the machineconfig repo, or do not use the `--local` flag.", title="Error", border_style="red"))
+                return
         else: ve_line = "--with machineconfig[plot]"
         fire_line = f"uv run --python 3.13 {ve_line} {interpreter} {interactivity} {profile} {str(pyfile)}"
 

{machineconfig-5.38 → machineconfig-5.40}/src/machineconfig/scripts/python/croshell_helpers/start_slidev.py

@@ -2,7 +2,7 @@
 slidev
 """
 
-from machineconfig.utils.source_of_truth import CONFIG_PATH
+from machineconfig.utils.source_of_truth import CONFIG_ROOT
 from machineconfig.utils.code import print_code
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.terminal import Response
@@ -13,7 +13,7 @@ import platform
 
 PORT_DEFAULT = 3030
 
-SLIDEV_REPO = PathExtended(CONFIG_PATH).joinpath(".cache/slidev")
+SLIDEV_REPO = PathExtended(CONFIG_ROOT).joinpath(".cache/slidev")
 if not SLIDEV_REPO.joinpath("components").exists():
     print("📦 Initializing Slidev repository...")
     subprocess.run(f"cd {SLIDEV_REPO.parent};npm init slidev@latest", check=False, shell=True, text=True)

{machineconfig-5.38 → machineconfig-5.40}/src/machineconfig/scripts/python/devops.py

@@ -5,7 +5,7 @@ from typing import Optional
 
 import machineconfig.scripts.python.devops_helpers.cli_repos as cli_repos
 import machineconfig.scripts.python.devops_helpers.cli_config as cli_config
-from machineconfig.scripts.python.devops_helpers.cli_self import cli_app as cli_app
+import machineconfig.scripts.python.devops_helpers.cli_self as cli_self
 import machineconfig.scripts.python.devops_helpers.cli_data as cli_data
 import machineconfig.scripts.python.devops_helpers.cli_nw as cli_network
 
@@ -24,7 +24,7 @@ def install( which: Optional[str] = typer.Option(None, "--which", "-w", help="Co
 app.add_typer(cli_repos.app, name="repos")
 app.add_typer(cli_config.config_apps, name="config")
 app.add_typer(cli_data.app_data, name="data")
-app.add_typer(cli_app, name="self")
+app.add_typer(cli_self.cli_app, name="self")
 app.add_typer(cli_network.nw_apps, name="network")
 
 

{machineconfig-5.38 → machineconfig-5.40}/src/machineconfig/scripts/python/devops_helpers/cli_config.py

@@ -13,8 +13,8 @@ def private(method: Literal["symlink", "copy"] = typer.Option(..., "--method", "
                              which: Optional[str] = typer.Option(None, "--which", "-w", help="Specific items to process"),
                              interactive: bool = typer.Option(False, "--interactive", "-ia", help="Run in interactive mode")):
     """🔗 Manage private configuration files."""
-    import machineconfig.profile.create_frontend as create_frontend
-    create_frontend.main_private_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
+    import machineconfig.profile.create_links_export as create_links_export
+    create_links_export.main_private_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
 
 @config_apps.command(no_args_is_help=True)
 def public(method: Literal["symlink", "copy"] = typer.Option(..., "--method", "-m", help="Method to use for setting up the config file."),
@@ -22,8 +22,8 @@ def public(method: Literal["symlink", "copy"] = typer.Option(..., "--method", "-
                             which: Optional[str] = typer.Option(None, "--which", "-w", help="Specific items to process"),
                             interactive: bool = typer.Option(False, "--interactive", "-ia", help="Run in interactive mode")):
     """🔗 Manage public configuration files."""
-    import machineconfig.profile.create_frontend as create_frontend
-    create_frontend.main_public_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
+    import machineconfig.profile.create_links_export as create_links_export
+    create_links_export.main_public_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
 
 @config_apps.command(no_args_is_help=True)
 def dotfile(file: Annotated[str, typer.Argument(help="file/folder path.")],
@@ -35,18 +35,17 @@ def dotfile(file: Annotated[str, typer.Argument(help="file/folder path.")],
     dotfile_module.main(file=file, overwrite=overwrite, dest=dest)
 
 
-@config_apps.command(no_args_is_help=True)
-def shell(method: Annotated[Literal["copy", "reference"], typer.Argument(help="Choose the method to configure the shell profile: 'copy' copies the init script directly, 'reference' references machineconfig for dynamic updates.")]):
+@config_apps.command(no_args_is_help=False)
+def shell():
     """🔗 Configure your shell profile."""
-    from machineconfig.profile.shell import create_default_shell_profile
-    create_default_shell_profile(method=method)
+    from machineconfig.profile.create_shell_profile import create_default_shell_profile
+    create_default_shell_profile()
 
 
 @config_apps.command(no_args_is_help=False)
 def pwsh_theme():
-    """🔗 Configure your shell profile."""
+    """🔗 Select powershell prompt theme."""
     import machineconfig.scripts.python.devops_helpers.themes as themes
     file = Path(themes.__file__).parent / "choose_pwsh_theme.ps1"
     import subprocess
-    # subprocess.run(["pwsh", "-File", str(file)])
     subprocess.run(["pwsh", "-File", str(file)])

{machineconfig-5.38 → machineconfig-5.40}/src/machineconfig/scripts/python/devops_helpers/cli_config_dotfile.py

@@ -23,7 +23,7 @@ def main(
 
     from machineconfig.utils.links import symlink_map
     from machineconfig.utils.path_extended import PathExtended
-    from machineconfig.utils.source_of_truth import LIBRARY_ROOT, REPO_ROOT
+    from machineconfig.utils.source_of_truth import CONFIG_ROOT
     console = Console()
     orig_path = PathExtended(file).expanduser().absolute()
     if dest == "":
@@ -35,7 +35,7 @@ def main(
             junction = orig_path.split(at=".config", sep=-1)[1]
         else:
             junction = orig_path.rel2home()
-        new_path = PathExtended(REPO_ROOT).joinpath(junction)
+        new_path = PathExtended(CONFIG_ROOT).parent.parent.joinpath(junction)
     else:
         dest_path = PathExtended(dest).expanduser().absolute()
         dest_path.mkdir(parents=True, exist_ok=True)
@@ -59,7 +59,7 @@ def main(
 
     mapper_snippet = "\n".join(
         [
-            f"[bold]📝 Edit configuration file:[/] [cyan]nano {PathExtended(LIBRARY_ROOT)}/symlinks/mapper.toml[/cyan]",
+            f"[bold]📝 Edit configuration file:[/] [cyan]nano {PathExtended(CONFIG_ROOT)}/symlinks/mapper.toml[/cyan]",
             "",
             f"[{new_path.parent.name}]",
             f"{orig_path.name.split('.')[0]} = {{ this = '{orig_path.collapseuser().as_posix()}', to_this = '{new_path.collapseuser().as_posix()}' }}",

{machineconfig-5.38 → machineconfig-5.40}/src/machineconfig/scripts/python/devops_helpers/cli_self.py

@@ -1,4 +1,5 @@
 
+from git import Optional
 import typer
 
 cli_app = typer.Typer(help="🔄 SELF operations subcommands", no_args_is_help=True)
@@ -24,18 +25,30 @@ def clone():
     """📋 CLONE machienconfig locally and incorporate to shell profile for faster execution and nightly updates."""
     import platform
     from machineconfig.utils.code import run_shell_script
-    from machineconfig.profile.shell import create_default_shell_profile
+    from machineconfig.profile.create_shell_profile import create_default_shell_profile
     if platform.system() == "Windows":
         from machineconfig.setup_windows import MACHINECONFIG
-        create_default_shell_profile(method="copy")
+        create_default_shell_profile()
     else:
         from machineconfig.setup_linux import MACHINECONFIG
-        create_default_shell_profile(method="reference")
+        create_default_shell_profile()
     run_shell_script(MACHINECONFIG.read_text(encoding="utf-8"))
 
-@cli_app.command()
+@cli_app.command(no_args_is_help=False)
 def navigate():
     """📚 NAVIGATE command structure with TUI"""
     from machineconfig.scripts.python.devops_navigator import main
     main()
 
+
+@cli_app.command(no_args_is_help=True)
+def run_python(ip: str = typer.Argument(..., help="Python command to run in the machineconfig environment"),
+               command: Optional[bool] = typer.Option(False, "--command", "-c", help="Run as command")):
+    """🐍 RUN python command/file in the machineconfig environment"""
+    if command:
+        exec(ip)
+        return
+    import machineconfig
+    import subprocess
+    import sys
+    subprocess.run([sys.executable, ip], cwd=machineconfig.__path__[0])

{machineconfig-5.38 → machineconfig-5.40}/src/machineconfig/scripts/python/devops_helpers/devops_status.py

@@ -11,7 +11,7 @@ from rich.table import Table
 from rich.text import Text
 
 from machineconfig.utils.path_extended import PathExtended
-from machineconfig.utils.source_of_truth import CONFIG_PATH, DEFAULTS_PATH, LIBRARY_ROOT
+from machineconfig.utils.source_of_truth import CONFIG_ROOT, DEFAULTS_PATH, LIBRARY_ROOT
 
 
 console = Console()
@@ -36,7 +36,7 @@ def _check_system_info() -> dict[str, str]:
 
 def _check_shell_profile_status() -> dict[str, Any]:
     """Check shell profile configuration status."""
-    from machineconfig.profile.shell import get_shell_profile_path
+    from machineconfig.profile.create_shell_profile import get_shell_profile_path
 
     try:
         profile_path = get_shell_profile_path()
@@ -46,13 +46,13 @@ def _check_shell_profile_status() -> dict[str, Any]:
         profile_content = profile_path.read_text(encoding="utf-8")
         system_name = platform.system()
         if system_name == "Windows":
-            init_script = PathExtended(LIBRARY_ROOT).joinpath("settings/shells/pwsh/init.ps1")
-            init_script_copy = PathExtended(CONFIG_PATH).joinpath("profile/init.ps1").collapseuser()
+            init_script = PathExtended(CONFIG_ROOT).joinpath("settings/shells/pwsh/init.ps1")
+            init_script_copy = PathExtended(CONFIG_ROOT).joinpath("profile/init.ps1").collapseuser()
             source_reference = f". {str(init_script.collapseuser()).replace('~', '$HOME')}"
             source_copy = f". {str(init_script_copy).replace('~', '$HOME')}"
         else:
-            init_script = PathExtended(LIBRARY_ROOT).joinpath("settings/shells/bash/init.sh")
-            init_script_copy = PathExtended(CONFIG_PATH).joinpath("profile/init.sh").collapseuser()
+            init_script = PathExtended(CONFIG_ROOT).joinpath("settings/shells/bash/init.sh")
+            init_script_copy = PathExtended(CONFIG_ROOT).joinpath("profile/init.sh").collapseuser()
             source_reference = f"source {str(init_script.collapseuser()).replace('~', '$HOME')}"
             source_copy = f"source {str(init_script_copy).replace('~', '$HOME')}"
 
@@ -79,34 +79,6 @@ def _check_shell_profile_status() -> dict[str, Any]:
         }
 
 
-def _check_machineconfig_repo() -> dict[str, Any]:
-    """Check machineconfig repository status."""
-    repo_path = Path.home().joinpath("code/machineconfig")
-    if not repo_path.exists():
-        return {"exists": False, "is_repo": False, "clean": False, "branch": "N/A", "commit": "N/A", "remotes": []}
-
-    try:
-        import git
-
-        repo = git.Repo(str(repo_path))
-        is_dirty = repo.is_dirty(untracked_files=True)
-        current_branch = repo.active_branch.name if not repo.head.is_detached else "DETACHED"
-        current_commit = repo.head.commit.hexsha[:8]
-        remotes = [remote.name for remote in repo.remotes]
-
-        return {
-            "exists": True,
-            "is_repo": True,
-            "clean": not is_dirty,
-            "branch": current_branch,
-            "commit": current_commit,
-            "remotes": remotes,
-            "path": str(repo_path),
-        }
-    except Exception as ex:
-        return {"exists": True, "is_repo": False, "clean": False, "branch": "Error", "commit": "N/A", "remotes": [], "error": str(ex)}
-
-
 def _check_repos_status() -> dict[str, Any]:
     """Check configured repositories status."""
     from machineconfig.utils.io import read_ini
@@ -178,7 +150,7 @@ def _check_ssh_status() -> dict[str, Any]:
 
 def _check_config_files_status() -> dict[str, Any]:
     """Check public and private configuration files status."""
-    from machineconfig.profile.create import read_mapper
+    from machineconfig.profile.create_links import read_mapper
 
     try:
         mapper = read_mapper()
@@ -320,48 +292,6 @@ def _display_shell_status(status: dict[str, Any]) -> None:
     )
 
 
-def _display_machineconfig_repo(info: dict[str, Any]) -> None:
-    """Display machineconfig repository status."""
-    console.rule("[bold magenta]📦 Machineconfig Repository[/bold magenta]")
-
-    if not info["exists"]:
-        console.print(
-            Panel(
-                "❌ Machineconfig repository not found at ~/code/machineconfig",
-                title="Repository Status",
-                border_style="red",
-                padding=(1, 2),
-                expand=False,
-            )
-        )
-        return
-
-    if not info["is_repo"]:
-        console.print(
-            Panel(
-                f"❌ Directory exists but is not a git repository\n{info.get('error', 'Unknown error')}",
-                title="Repository Status",
-                border_style="red",
-                padding=(1, 2),
-                expand=False,
-            )
-        )
-        return
-
-    table = Table(show_header=False, box=None, padding=(0, 1), expand=False)
-    table.add_column("Property", style="cyan", no_wrap=True)
-    table.add_column("Value", style="white")
-
-    table.add_row("📁 Path", info["path"])
-    table.add_row("🌿 Branch", info["branch"])
-    table.add_row("🔖 Commit", info["commit"])
-    table.add_row(f"{'✅' if info['clean'] else '⚠️'} Status", "Clean" if info["clean"] else "Uncommitted changes")
-    table.add_row("📡 Remotes", ", ".join(info["remotes"]) if info["remotes"] else "None")
-
-    border_style = "green" if info["clean"] else "yellow"
-    console.print(Panel(table, title="Machineconfig Repository", border_style=border_style, padding=(1, 2), expand=False))
-
-
 def _display_repos_status(status: dict[str, Any]) -> None:
     """Display configured repositories status."""
     console.rule("[bold cyan]📚 Configured Repositories[/bold cyan]")
@@ -557,9 +487,6 @@ def main() -> None:
     shell_status = _check_shell_profile_status()
     _display_shell_status(shell_status)
 
-    machineconfig_repo = _check_machineconfig_repo()
-    _display_machineconfig_repo(machineconfig_repo)
-
     repos_status = _check_repos_status()
     _display_repos_status(repos_status)