machineconfig 7.36__tar.gz → 7.38__tar.gz

{machineconfig-7.36/src/machineconfig.egg-info → machineconfig-7.38}/PKG-INFO

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

{machineconfig-7.36 → machineconfig-7.38}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "7.36"
+version = "7.38"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/jobs/installer/installer_data.json

@@ -1106,6 +1106,23 @@
         }
       }
     },
+    {
+      "appName": "cb",
+      "repoURL": "CMD",
+      "doc": "📋 Clipboard manager for the terminal",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "curl -sSL https://github.com/Slackadays/Clipboard/raw/main/install.sh | sh",
+          "macos": "curl -sSL https://github.com/Slackadays/Clipboard/raw/main/install.sh | sh",
+          "windows": "winget install -e --id Slackadays.Clipboard"
+        },
+        "arm64": {
+          "linux": "curl -sSL https://github.com/Slackadays/Clipboard/raw/main/install.sh | sh",
+          "macos": "curl -sSL https://github.com/Slackadays/Clipboard/raw/main/install.sh | sh",
+          "windows": "winget install -e --id Slackadays.Clipboard"
+        }
+      }
+    },
     {
       "appName": "atuin",
       "repoURL": "https://github.com/atuinsh/atuin",

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/jobs/installer/package_groups.py

@@ -210,6 +210,7 @@ PACKAGES_TERMINAL_SHELL = [
     "gotty",
     "ttyd",
     "rclone",
+    "cb"
 ]
 
 

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/profile/create_helper.py

@@ -12,16 +12,19 @@ def copy_assets_to_machine(which: Literal["scripts", "settings"]):
         system = "linux"
     else:
         raise NotImplementedError(f"System {platform.system().lower()} not supported")
+    from machineconfig.utils.path_extended import PathExtended
     match which:
         case "scripts":
             source = LIBRARY_ROOT.joinpath("scripts", system)
             target = CONFIG_ROOT.joinpath("scripts", system)
 
+            PathExtended(LIBRARY_ROOT.joinpath("scripts", "nu", "wrap_mcfg.nu")).copy(folder=CONFIG_ROOT.joinpath("scripts"), overwrite=True)
         case "settings":
             source = LIBRARY_ROOT.joinpath("settings")
             target = CONFIG_ROOT.joinpath("settings")
-    from machineconfig.utils.path_extended import PathExtended
+
     PathExtended(source).copy(folder=target.parent, overwrite=True)
+
     import platform
     system = platform.system().lower()
     if system == "linux" and which == "scripts":

machineconfig-7.38/src/machineconfig/scripts/nu/wrap_mcfg.nu

@@ -0,0 +1,69 @@
+#!/usr/bin/env nu
+
+def wrap-in-shell-script [command: string ...args: string] -> nothing {
+  # ANSI color/style codes
+  let bold = (char ansi_reset | str append "\e[1m")
+  let reset = "\e[0m"
+  let green = "\e[32m"
+  let yellow = "\e[33m"
+  let blue = "\e[34m"
+  let red = "\e[31m"
+
+  let random_name = (date now | format date "%s%N" | sha256sum | str substring 0..16)
+  let op_dir = $"($env.HOME)/tmp_results/tmp_scripts/machineconfig"
+  let op_program_path = $"($op_dir)/($random_name).sh"
+  
+  $env.OP_PROGRAM_PATH = $op_program_path
+  
+  let timestamp = (date now --utc | format date "%Y-%m-%d %H:%M:%SZ")
+  
+  print $"($bold)($blue)🛠️  machineconfig — running ($command)($reset)"
+  print $"($blue)Timestamp:($reset) ($timestamp)"
+  print $"($blue)Op program path:($reset) ($op_program_path)"
+
+  # Forward arguments to the command
+  let result = (
+    try {
+      nu -c $"($command) ($args | str join ' ')"
+    } catch {
+      $"Error running command: ($in)"
+    }
+  )
+
+  if ($op_program_path | path exists) {
+    print $"($green)🚀 Taking over from python script @ ($op_program_path)($reset)"
+    
+    if (which bat | is-empty | not) {
+      bat --style=plain --paging=never $op_program_path
+    } else {
+      open $op_program_path
+    }
+    
+    print $"($green)▶ Running...($reset)"
+    
+    let status = (
+      try {
+        bash $op_program_path
+        0
+      } catch {
+        1
+      }
+    )
+    
+    if ($status == 0) {
+      print $"($green)✅ '($command)' execution completed.($reset)"
+    } else {
+      print $"($yellow)⚠️  Program exited with status ($status)($reset)"
+    }
+  } else {
+    print $"($green)✅ '($command)' execution completed.($reset)"
+  }
+}
+
+def main [] {
+  if ($nu.env.args | length) > 0 {
+    wrap-in-shell-script ...$nu.env.args
+  }
+}
+
+main

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/scripts/python/croshell.py

@@ -130,7 +130,7 @@ def croshell(
             fire_line = f"uv run --python 3.14 --with visidata,pyarrow vd {str(file_obj)}"
     elif marimo:
         if Path.home().joinpath("code/machineconfig").exists(): requirements = f"""--with marimo --project "{str(Path.home().joinpath("code/machineconfig"))}" """
-        else: requirements = """--python 3.14 --with "marimo,machineconfig[plot]>=7.36" """
+        else: requirements = """--python 3.14 --with "marimo,machineconfig[plot]>=7.38" """
         fire_line = f"""
 cd {str(pyfile.parent)}
 uv run --python 3.14 --with "marimo" marimo convert {pyfile.name} -o marimo_nb.py
@@ -138,14 +138,14 @@ uv run {requirements} marimo edit --host 0.0.0.0 marimo_nb.py
 """
     elif jupyter:
         if Path.home().joinpath("code/machineconfig").exists(): requirements = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" --with jupyterlab """
-        else: requirements = """--with "machineconfig[plot]>=7.36" """
+        else: requirements = """--with "machineconfig[plot]>=7.38" """
         fire_line = f"uv run {requirements} jupyter-lab {str(nb_target)}"
     elif vscode:
         fire_line = f"""
 cd {str(pyfile.parent)}
 uv init --python 3.14
 uv venv
-uv add "machineconfig[plot]>=7.36"
+uv add "machineconfig[plot]>=7.38"
 # code serve-web
 code --new-window {str(pyfile)}
 """
@@ -153,20 +153,13 @@ code --new-window {str(pyfile)}
         if interpreter == "ipython": profile = f" --profile {ipython_profile} --no-banner"
         else: profile = ""
         if Path.home().joinpath("code/machineconfig").exists(): ve_line = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" """
-        else: ve_line = """--python 3.14 --with "machineconfig[plot]>=7.36" """
+        else: ve_line = """--python 3.14 --with "machineconfig[plot]>=7.38" """
         # ve_path_maybe, ipython_profile_maybe = get_ve_path_and_ipython_profile(Path.cwd())
         # --python 3.14
         fire_line = f"uv run {ve_line} {interpreter} {interactivity} {profile} {str(pyfile)}"
 
-    import os
-    program_path_maybe = os.environ.get("OP_PROGRAM_PATH", None)
-    if program_path_maybe is not None:
-        program_path_obj = PathExtended(program_path_maybe)
-        program_path_obj.parent.mkdir(parents=True, exist_ok=True)
-        program_path_obj.write_text(data=fire_line, encoding="utf-8")
-    else:
-        from machineconfig.utils.code import run_shell_script
-        run_shell_script(fire_line, clean_env=False)
+    from machineconfig.utils.code import exit_then_run_shell_script
+    exit_then_run_shell_script(fire_line, strict=False)
 
 
 def main() -> None:

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

@@ -2,7 +2,7 @@
 # /// script
 # requires-python = ">=3.13"
 # dependencies = [
-#     "machineconfig>=7.36",
+#     "machineconfig>=7.38",
 #     "textual",
 #     "pyperclip",
 # ]

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/scripts/python/fire_jobs.py

@@ -38,6 +38,7 @@ def route(args: FireJobArgs, fire_args: str = "") -> None:
     repo_root = get_repo_root(Path(choice_file))
     print(f"💾 Selected file: {choice_file}.\nRepo root: {repo_root}")
     if args.marimo:
+        print(f"🧽 Preparing to launch Marimo notebook for `{choice_file}`...")
         tmp_dir = PathExtended.tmp().joinpath(f"tmp_scripts/marimo/{choice_file.stem}_{randstr()}")
         tmp_dir.mkdir(parents=True, exist_ok=True)
         script = f"""
@@ -52,6 +53,7 @@ uv run --project {repo_root} --with marimo marimo edit --host 0.0.0.0 marimo_nb.
 
     # =========================  preparing kwargs_dict
     if choice_file.suffix == ".py":
+        
         kwargs_dict = extract_kwargs(args)  # This now returns empty dict, but kept for compatibility
     else:
         kwargs_dict = {}
@@ -165,15 +167,9 @@ uv run --project {repo_root} --with marimo marimo edit --host 0.0.0.0 marimo_nb.
             command = "$ErrorActionPreference = 'SilentlyContinue';\n" + command + "\nStart-Sleep -Seconds 0.5"
         else:
             raise NotImplementedError(f"Platform {platform.system()} not supported.")
-    import os
-    op_program_path = os.environ.get("OP_PROGRAM_PATH", None)
-    if op_program_path is not None:
-        op_program_path = Path(op_program_path)
-        op_program_path.parent.mkdir(parents=True, exist_ok=True)
-        op_program_path.write_text(command, encoding="utf-8")
-    else:
-        from machineconfig.utils.code import run_shell_script
-        run_shell_script(command)
+
+    from machineconfig.utils.code import exit_then_run_shell_script
+    exit_then_run_shell_script(script=command, strict=False)
 
 
 def fire(

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/scripts/python/helpers_devops/cli_config.py

@@ -39,7 +39,7 @@ def path():
     uv_with = ["textual"]
     uv_project_dir = None
     if not Path.home().joinpath("code/machineconfig").exists():
-        uv_with.append("machineconfig>=7.36")
+        uv_with.append("machineconfig>=7.38")
     else:
         uv_project_dir = str(Path.home().joinpath("code/machineconfig"))
     run_shell_script(get_uv_command_executing_python_script(python_script=path.read_text(encoding="utf-8"), uv_with=uv_with, uv_project_dir=uv_project_dir)[0])

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/scripts/python/helpers_devops/cli_self.py

@@ -48,9 +48,9 @@ def install(no_copy_assets: Annotated[bool, typer.Option("--no-assets-copy", "-n
     else:
         import platform
         if platform.system() == "Windows":
-            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=7.36" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=7.38" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=7.36" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=7.38" """)
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     if not no_copy_assets:
         create_default_shell_profile()   # involves copying assets too
@@ -75,7 +75,7 @@ def navigate():
     path = Path(navigator.__file__).resolve().parent.joinpath("devops_navigator.py")
     from machineconfig.utils.code import run_shell_script
     if Path.home().joinpath("code/machineconfig").exists(): executable = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" --with textual"""
-    else: executable = """--with "machineconfig>=7.36,textual" """
+    else: executable = """--with "machineconfig>=7.38,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/scripts/python/helpers_devops/cli_utils.py

@@ -5,6 +5,18 @@ from typing import Annotated, Literal, Optional, TypedDict
 from pathlib import Path
 
 
+# def copy(path: Annotated[str, typer.Argument(..., help="Path of the file to copy to clipboard")]):
+#     def copy_internal(path: str):
+#         import pyperclip
+#         from pathlib import Path
+#         pyperclip.copy(Path(path).read_text(encoding="utf-8"))
+#     from machineconfig.utils.meta import lambda_to_python_script
+#     from machineconfig.utils.code import exit_then_run_shell_script, get_uv_command_executing_python_script
+#     py_script = lambda_to_python_script(lambda: copy_internal(path=str(path)), in_global=True, import_module=False)
+#     shell_script, _python_file = get_uv_command_executing_python_script(python_script=py_script, uv_with=["pyperclip"], uv_project_dir=None)
+#     exit_then_run_shell_script(shell_script, strict=True)
+
+
 def download(
     url: Annotated[Optional[str], typer.Argument(..., help="The URL to download the file from.")] = None,
     decompress: Annotated[bool, typer.Option("--decompress", "-d", help="Decompress the file if it's an archive.")] = False,

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -80,7 +80,7 @@ git pull originEnc master
         uv_project_dir = f"""{str(Path.home().joinpath("code/machineconfig"))}"""
         uv_with = None
     else:
-        uv_with = ["machineconfig>=7.36"]
+        uv_with = ["machineconfig>=7.38"]
         uv_project_dir = None
 
     import tempfile

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/scripts/python/helpers_repos/count_lines_frontend.py

@@ -8,7 +8,7 @@ def analyze_repo_development(repo_path: Annotated[str, typer.Argument(..., help=
     from pathlib import Path
     count_lines_path = Path(count_lines.__file__)
     # --project $HOME/code/ machineconfig --group plot
-    cmd = f"""uv run --python 3.14 --with "machineconfig[plot]>=7.36" {count_lines_path} analyze-over-time {repo_path}"""
+    cmd = f"""uv run --python 3.14 --with "machineconfig[plot]>=7.38" {count_lines_path} analyze-over-time {repo_path}"""
     from machineconfig.utils.code import run_shell_script
     run_shell_script(cmd)
 

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/scripts/python/msearch.py

@@ -11,16 +11,8 @@ def machineconfig_find():
         script_path = FZFG_WINDOWS_PATH
     else:
         raise RuntimeError("Unsupported platform")
-    import os
-    op_program_path = os.getenv("OP_PROGRAM_PATH")
-    if op_program_path is None:
-        typer.echo("Error: OP_PROGRAM_PATH environment variable is not set, please run using `wrap_mcfg msearch` ", err=True)
-        raise typer.Exit(code=1)
-    from pathlib import Path
-    op_program_path = Path(op_program_path)
-    op_program_path.write_text(script_path.read_text(encoding="utf-8"), encoding="utf-8")
-    # Use the script_path as needed
-    # print(f"Using script at: {script_path}")
+    from machineconfig.utils.code import exit_then_run_shell_script
+    exit_then_run_shell_script(script=script_path.read_text(encoding="utf-8"), strict=False)
 
 
 def main():

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/scripts/python/utils.py

@@ -45,6 +45,9 @@ def get_app() -> typer.Typer:
     app.command(name="pdf-compress", no_args_is_help=True, help="[pc] Compress a PDF file.")(compress_pdf)
     app.command(name="pc", no_args_is_help=True, hidden=True)(compress_pdf)
 
+    # app.command(name="copy", no_args_is_help=True, help="[c] Copy files or directories.")(copy)
+    # app.command(name="c", no_args_is_help=True, hidden=True)(copy)
+
     return app
 
 # def func():

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=7.36" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=7.38" python -m machineconfig.scripts.python.mount_ssh
 
 net use T: \\sshfs.kr\$user@$host.local
 # this worked: net use T: \\sshfs\alex@alex-p51s-5.local

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/settings/shells/bash/init.sh

@@ -50,7 +50,7 @@ alias d='wrap_in_shell_script devops'
 alias c='wrap_in_shell_script cloud'
 alias a='wrap_in_shell_script agents'
 alias s='wrap_in_shell_script sessions'
-alias ff='wrap_in_shell_script ftpx'
+alias fx='wrap_in_shell_script ftpx'
 alias f='wrap_in_shell_script fire'
 alias r='wrap_in_shell_script croshell'
 alias u='wrap_in_shell_script utils'

machineconfig-7.38/src/machineconfig/settings/shells/nushell/init.nu

@@ -0,0 +1,61 @@
+# Nushell initialization script
+# Translation of init.ps1 to Nushell
+
+const CONFIG_ROOT = $"($env.HOME)/.config/machineconfig"
+
+# Add directories to PATH if not already present
+def add_to_path_if_not_already [...directories: string] {
+    for dir in $directories {
+        if $dir not-in $env.PATH {
+            $env.PATH = ($env.PATH | append $dir)
+        }
+    }
+}
+
+# Add directories to PATH
+add_to_path_if_not_already (
+    $"($CONFIG_ROOT)/scripts/linux"
+    $"($env.HOME)/dotfiles/scripts/linux"
+    "/usr/local/bin"
+)
+
+# Source external scripts and define aliases
+if ($"($CONFIG_ROOT)/scripts/linux" | path exists) {
+    # Source helper scripts
+    source $"($CONFIG_ROOT)/settings/broot/brootcd.nu"
+    source $"($CONFIG_ROOT)/settings/lf/linux/lfcd.nu"
+    source $"($CONFIG_ROOT)/settings/tere/terecd.nu"
+    source $"($CONFIG_ROOT)/scripts/linux/wrap_mcfg.nu"
+
+    # Define aliases and custom commands
+    def lsdla [] { lsd -la }
+    alias l = lsdla
+    
+    def d [...args: string] { wrap_in_shell_script devops ...$args }
+    def c [...args: string] { wrap_in_shell_script cloud ...$args }
+    def a [...args: string] { wrap_in_shell_script agents ...$args }
+    def ss [...args: string] { wrap_in_shell_script sessions ...$args }
+    def ff [...args: string] { wrap_in_shell_script ftpx ...$args }
+    def f [...args: string] { wrap_in_shell_script fire ...$args }
+    def rr [...args: string] { wrap_in_shell_script croshell ...$args }
+    def u [...args: string] { wrap_in_shell_script utils ...$args }
+    def t [...args: string] { wrap_in_shell_script terminal ...$args }
+    def ms [...args: string] { wrap_in_shell_script msearch ...$args }
+} else {
+    print $"Missing config files: ($CONFIG_ROOT)"
+}
+
+# Initialize zoxide if available
+# Patched by machineconfig from https://github.com/ajeetdsouza/zoxide
+try {
+    source <(zoxide init nushell)
+} catch {
+    # Do nothing if zoxide is not available
+}
+
+# Initialize Starship prompt if available
+try {
+    source <(starship init nu)
+} catch {
+    # Do nothing if starship is not available
+}

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/settings/shells/pwsh/init.ps1

@@ -35,8 +35,8 @@ if (Test-Path "$CONFIG_ROOT\scripts\windows\wrap_mcfg.ps1") {
     function d { wrap_in_shell_script devops $args }
     function c { wrap_in_shell_script cloud $args }
     function a { wrap_in_shell_script agents $args }
-    function ss { wrap_in_shell_script sessions $args }
-    function ff { wrap_in_shell_script ftpx $args }
+    function sx { wrap_in_shell_script sessions $args }
+    function fx { wrap_in_shell_script ftpx $args }
     function f { wrap_in_shell_script fire $args }
     function rr { wrap_in_shell_script croshell $args }
     function u { wrap_in_shell_script utils $args }
@@ -51,8 +51,8 @@ else {
     function d { devops $args }
     function c { cloud $args }
     function a { agents $args }
-    function ss { sessions $args }
-    function ff { ftpx $args }
+    function sx { sessions $args }
+    function fx { ftpx $args }
     function f { fire $args }
     function rr { croshell $args }
     function u { utils $args }

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/settings/shells/wt/settings.json

@@ -70,7 +70,7 @@
                 "startingDirectory": "%USERPROFILE%"
             },
             {
-                "commandline": "powershell.exe -Command \"$HOME/scripts/croshell.ps1\"",
+                "commandline": "powershell.exe -Command \"rr\"",
                 "guid": "{1e951406-6597-48c7-8137-b967bed19572}",
                 "name": "croshell",
                 "startingDirectory": "%USERPROFILE%"
@@ -101,8 +101,9 @@
             {
                 "guid": "{b453ae62-4e3d-5e58-b989-0a998ec441b8}",
                 "hidden": false,
-                "name": "Azure Cloud Shell",
-                "source": "Windows.Terminal.Azure"
+                "commandline": "nu.exe",
+                "name": "nushell"
+                // "source": "Windows.Terminal.Azure"
             },
             {
                 "guid": "{2ddc9f1a-8263-557a-8652-3db9e80a7164}",

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -2,22 +2,22 @@
 . <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/uv.sh")
 . <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/scripts/linux/wrap_mcfg")
 
-alias devops='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.36" devops'
-alias cloud='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.36" cloud'
-alias agents='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.36" agents'
-alias sessions='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.36" sessions'
-alias ftpx='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.36" ftpx'
-alias fire='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.36" fire'
-alias croshell='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.36" croshell'
-alias utils='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.36" utils'
-alias terminal='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.36" terminal'
-alias msearch='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.36" msearch'
+alias devops='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" devops'
+alias cloud='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" cloud'
+alias agents='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" agents'
+alias sessions='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" sessions'
+alias ftpx='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" ftpx'
+alias fire='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" fire'
+alias croshell='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" croshell'
+alias utils='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" utils'
+alias terminal='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" terminal'
+alias msearch='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" msearch'
 
 alias d='wrap_in_shell_script devops'
 alias c='wrap_in_shell_script cloud'
 alias a='wrap_in_shell_script agents'
 alias ss='wrap_in_shell_script sessions'
-alias ff='wrap_in_shell_script ftpx'
+alias fx='wrap_in_shell_script ftpx'
 alias f='wrap_in_shell_script fire'
 alias rr='wrap_in_shell_script croshell'
 alias u='wrap_in_shell_script utils'

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -3,22 +3,22 @@
 iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/uv.ps1").Content
 iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/scripts/windows/wrap_mcfg.ps1").Content
 
-function devops   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.36" devops $args }
-function cloud    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.36" cloud $args }
-function agents   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.36" agents $args }
-function sessions { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.36" sessions $args }
-function ftpx     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.36" ftpx $args }
-function fire     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.36" fire $args }
-function croshell { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.36" croshell $args }
-function utils    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.36" utils $args }
-function terminal { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.36" terminal $args }
-function msearch    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.36" msearch $args }
+function devops   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" devops $args }
+function cloud    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" cloud $args }
+function agents   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" agents $args }
+function sessions { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" sessions $args }
+function ftpx     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" ftpx $args }
+function fire     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" fire $args }
+function croshell { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" croshell $args }
+function utils    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" utils $args }
+function terminal { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" terminal $args }
+function msearch    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" msearch $args }
 
 function d { wrap_in_shell_script devops @args }
 function c { wrap_in_shell_script cloud @args }
 function a { wrap_in_shell_script agents @args }
-function ss { wrap_in_shell_script sessions @args }
-function ff { wrap_in_shell_script ftpx @args }
+function sx { wrap_in_shell_script sessions @args }
+function fx { wrap_in_shell_script ftpx @args }
 function f { wrap_in_shell_script fire @args }
 function rr { wrap_in_shell_script croshell @args }
 function u { wrap_in_shell_script utils @args }

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/utils/code.py

@@ -110,27 +110,47 @@ def run_shell_script(script: str, display_script: bool = True, clean_env: bool =
 
 def exit_then_run_shell_script(script: str, strict: bool = False):
     import os
+    from rich.console import Console
+    
+    console = Console()
     op_program_path = os.environ.get("OP_PROGRAM_PATH", None)
-    if strict and op_program_path is None:
-        import platform
-        if platform.system() == "Windows":
-            suffix = ".ps1"
-            lexer = "powershell"
-        else:
-            suffix = ".sh"
-            lexer = "bash"
-        op_program_path = Path.home().joinpath("tmp_results", "tmp_scripts", "manual_run", f"manual_script_{randstr()}.{suffix}")
-        op_program_path.parent.mkdir(parents=True, exist_ok=True)
-        op_program_path.write_text(script, encoding="utf-8")
-        print_code(script, lexer=lexer, desc="script to run manually")
-        print(f"Please run the script manually via your shell by executing the script @:\n{str(op_program_path)}")
-        print("OP_PROGRAM_PATH environment variable is not set in strict mode.")
     if op_program_path is not None:
+        exists = Path(op_program_path).exists()
+    else:
+        exists = False
+    # three cases: (op_program_path is None, exists=False), (op_program_path is set, exists=False), (op_program_path is set, exists=True)
+
+    if strict:  # we want to assert op_program_path is set and is not an already existing file
+        if (op_program_path is None or exists):
+            import platform
+            if platform.system() == "Windows":
+                suffix = ".ps1"
+                lexer = "powershell"
+            else:
+                suffix = ".sh"
+                lexer = "bash"
+            op_program_path = Path.home().joinpath("tmp_results", "tmp_scripts", "manual_run", f"manual_script_{randstr()}.{suffix}")
+            op_program_path.parent.mkdir(parents=True, exist_ok=True)
+            op_program_path.write_text(script, encoding="utf-8")
+            print_code(script, lexer=lexer, desc="script to run manually")
+            console.print("[bold yellow]⚠️  STRICT MODE:[/bold yellow] [cyan]Please run the script manually via your shell by executing:[/cyan]")
+            console.print(f"[green]{str(op_program_path)}[/green]")
+            console.print("[red]❌ OP_PROGRAM_PATH environment variable is not set in strict mode.[/red]")
+            import sys
+            sys.exit(1)
+
+    if op_program_path is not None and not exists:
         op_program_path = Path(op_program_path)
         op_program_path.parent.mkdir(parents=True, exist_ok=True)
         op_program_path.write_text(script, encoding="utf-8")
-        print(f"Handing over to shell script runner via OP_PROGRAM_PATH @\n{str(op_program_path)}...")
+        console.print("[cyan]🚀 Handing over to shell script runner via OP_PROGRAM_PATH:[/cyan]")
+        console.print(f"[bold green]{str(op_program_path)}[/bold green]")
+        print_code(script, lexer="shell", desc="script to run via OP_PROGRAM_PATH")
     else:
+        if op_program_path is not None and exists:
+            console.print(f"[yellow]⚠️  OP_PROGRAM_PATH @ {str(op_program_path)} already exists.[/yellow] [cyan]Falling back to direct execution.[/cyan]")
+        elif op_program_path is None:
+            console.print("[cyan]ℹ️  OP_PROGRAM_PATH is not set.[/cyan] [yellow]Falling back to direct execution.[/yellow]")
         run_shell_script(script)
     import sys
     sys.exit(0)

{machineconfig-7.36 → machineconfig-7.38}/src/machineconfig/utils/ssh.py

@@ -8,7 +8,7 @@ from machineconfig.utils.terminal import Response
 from machineconfig.utils.accessories import pprint, randstr
 from machineconfig.utils.meta import lambda_to_python_script
 UV_RUN_CMD = "$HOME/.local/bin/uv run" if platform.system() != "Windows" else """& "$env:USERPROFILE/.local/bin/uv" run"""
-MACHINECONFIG_VERSION = "machineconfig>=7.36"
+MACHINECONFIG_VERSION = "machineconfig>=7.38"
 DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
 
 class SSH:

{machineconfig-7.36 → machineconfig-7.38/src/machineconfig.egg-info}/PKG-INFO

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