machineconfig 6.85__tar.gz → 6.87__tar.gz

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

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

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

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

{machineconfig-6.85 → machineconfig-6.87}/src/machineconfig/scripts/python/agents.py

@@ -5,13 +5,13 @@
 from pathlib import Path
 from typing import cast, Optional, get_args, Annotated
 import typer
-from machineconfig.scripts.python.helpers_fire.fire_agents_helper_types import AGENTS, HOST, MODEL, PROVIDER
+from machineconfig.scripts.python.helpers_agents.fire_agents_helper_types import AGENTS, HOST, PROVIDER
 
 
 def create(
     agent: Annotated[AGENTS, typer.Option(..., "--agents", "-a", help=f"Agent type. One of {', '.join(get_args(AGENTS)[:3])}")],
     host: Annotated[HOST, typer.Option(..., "--host", "-h", help=f"Machine to run agents on. One of {', '.join(get_args(HOST))}")],
-    model: Annotated[MODEL, typer.Option(..., "--model", "-m", help=f"Model to use (for crush agent). One of {', '.join(get_args(MODEL)[:3])}")],
+    model: Annotated[str, typer.Option(..., "--model", "-m", help="Model to use (for crush agent).")],
     provider: Annotated[PROVIDER, typer.Option(..., "--provider", "-p", help=f"Provider to use (for crush agent). One of {', '.join(get_args(PROVIDER)[:3])}")],
     context_path: Annotated[Optional[Path], typer.Option(..., "--context-path", "-c", help="Path to the context file/folder, defaults to .ai/todo/")] = None,
     separator: Annotated[str, typer.Option(..., "--separator", "-s", help="Separator for context")] = "\n",
@@ -24,8 +24,8 @@ def create(
     agents_dir: Annotated[Optional[Path], typer.Option(..., "--agents-dir", "-ad", help="Directory to store agent files. If not provided, will be constructed automatically.")] = None,
 ):
 
-    from machineconfig.scripts.python.helpers_fire.fire_agents_help_launch import prep_agent_launch, get_agents_launch_layout
-    from machineconfig.scripts.python.helpers_fire.fire_agents_load_balancer import chunk_prompts
+    from machineconfig.scripts.python.helpers_agents.fire_agents_help_launch import prep_agent_launch, get_agents_launch_layout
+    from machineconfig.scripts.python.helpers_agents.fire_agents_load_balancer import chunk_prompts
     from machineconfig.utils.accessories import get_repo_root, randstr
     import json
 
@@ -85,7 +85,7 @@ agents create "{context_path_resolved}" \\
     --separator "{separator}" \\
     {"--separate" if separate else ""}
 """
-    (agents_dir / "aa_agents_relaunch.py").write_text(data=regenerate_py_code, encoding="utf-8")
+    (agents_dir / "aa_agents_relaunch.sh").write_text(data=regenerate_py_code, encoding="utf-8")
     layout_output_path = output_path if output_path is not None else agents_dir / "layout.json"
     layout_output_path.parent.mkdir(parents=True, exist_ok=True)
     layout_output_path.write_text(data=json.dumps(layoutfile, indent=4), encoding="utf-8")
@@ -136,11 +136,11 @@ def collect(
 
 def template():
     from platform import system
-    import machineconfig.scripts.python.helpers_fire as module
+    import machineconfig.scripts.python.helpers_agents as module
     if system() == "Linux" or system() == "Darwin":
-        template_path = Path(module.__file__).parent / "template.sh"
+        template_path = Path(module.__file__).parent / "templates/template.sh"
     elif system() == "Windows":
-        template_path = Path(module.__file__).parent / "template.ps1"
+        template_path = Path(module.__file__).parent / "templates/template.ps1"
     else:
         raise typer.BadParameter(f"Unsupported OS: {system()}")
 
@@ -168,8 +168,6 @@ def get_app():
 PROVIDER options: {', '.join(get_args(PROVIDER))}
 {sep}
 AGENT options: {', '.join(get_args(AGENTS))}
-{sep}
-MODEL options: {sep.join(get_args(MODEL))}
 """
     agents_app.command("create", no_args_is_help=True, help=agents_full_help)(create)
     agents_app.command("c", no_args_is_help=True, help="Create agents layout file, ready to run.", hidden=True)(create)

{machineconfig-6.85 → machineconfig-6.87}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

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

{machineconfig-6.85 → machineconfig-6.87}/src/machineconfig/scripts/python/fire_jobs.py

@@ -26,7 +26,7 @@ def route(args: FireJobArgs, fire_args: str = "") -> None:
         suffixes = {".py", ".sh", ".ps1"}
         choice_file = match_file_name(sub_string=args.path, search_root=PathExtended.cwd(), suffixes=suffixes)
     elif path_obj.is_dir():
-        from machineconfig.scripts.python.helpers_fire.helpers4 import search_for_files_of_interest
+        from machineconfig.scripts.python.helpers_fire_command.file_wrangler import search_for_files_of_interest
         print(f"🔍 Searching recursively for Python, PowerShell and Shell scripts in directory `{path_obj}`")
         files = search_for_files_of_interest(path_obj)
         print(f"🔍 Got #{len(files)} results.")
@@ -67,25 +67,26 @@ uv run --project {repo_root} --with marimo marimo edit --host 0.0.0.0 marimo_nb.
 
     if choice_file.suffix == ".py":
         from machineconfig.scripts.python.helpers_fire_command.fire_jobs_route_helper import get_command_streamlit
+        with_project = f"--project {repo_root} " if repo_root is not None else ""
         if args.streamlit:
             exe = get_command_streamlit(choice_file=choice_file, environment=args.environment, repo_root=repo_root)
-            exe = f"uv run {exe} "
-        elif args.jupyter: exe = "uv run jupyter-lab"
+            exe = f"uv run {with_project} {exe} "
+        elif args.jupyter: exe = f"uv run {with_project} jupyter-lab"
         else:
             if args.interactive:
                 _ve_root_from_file, ipy_profile = get_ve_path_and_ipython_profile(choice_file)
                 if ipy_profile is None:
                     ipy_profile = "default"
-                exe = f"uv run ipython -i --no-banner --profile {ipy_profile} "
+                exe = f"uv run {with_project} ipython -i --no-banner --profile {ipy_profile} "
             else:
-                exe = "uv run python "
+                exe = f"uv run {with_project} python "
     elif choice_file.suffix == ".ps1" or choice_file.suffix == ".sh": exe = "."
     elif choice_file.suffix == "": exe = ""
     else: raise NotImplementedError(f"File type {choice_file.suffix} not supported, in the sense that I don't know how to fire it.")
 
     if args.module or (args.debug and args.choose_function):  # because debugging tools do not support choosing functions and don't interplay with fire module. So the only way to have debugging and choose function options is to import the file as a module into a new script and run the function of interest there and debug the new script.
         assert choice_file.suffix == ".py", f"File must be a python file to be imported as a module. Got {choice_file}"
-        from machineconfig.scripts.python.helpers_fire.helpers4 import get_import_module_code, wrap_import_in_try_except
+        from machineconfig.scripts.python.helpers_fire_command.file_wrangler import get_import_module_code, wrap_import_in_try_except
         from machineconfig.utils.meta import lambda_to_python_script
         from machineconfig.utils.code import print_code
         import_code = get_import_module_code(str(choice_file))
@@ -155,12 +156,8 @@ uv run --project {repo_root} --with marimo marimo edit --host 0.0.0.0 marimo_nb.
     if args.git_pull:
         command = f"\ngit -C {choice_file.parent} pull\n" + command
     if args.PathExport:
-        if platform.system() in ["Linux", "Darwin"]:
-            export_line = f"""export PYTHONPATH="{repo_root}""" + """:${PYTHONPATH}" """
-        elif platform.system() == "Windows":
-            export_line = f"""$env:PYTHONPATH="{repo_root}""" + """:$env:PYTHONPATH" """
-        else:
-            raise NotImplementedError(f"Platform {platform.system()} not supported.")
+        from machineconfig.scripts.python.helpers_fire_command.file_wrangler import add_to_path
+        export_line = add_to_path(path_variable="PYTHONPATH", directory=str(repo_root))
         command = export_line + "\n" + command
     if args.loop:
         if platform.system() in ["Linux", "Darwin"]:

{machineconfig-6.85/src/machineconfig/scripts/python/helpers_fire → machineconfig-6.87/src/machineconfig/scripts/python/helpers_agents}/agentic_frameworks/fire_crush.py

@@ -1,36 +1,36 @@
 
 from pathlib import Path
 # import shlex
-from typing import Optional
-from machineconfig.scripts.python.helpers_fire.fire_agents_helper_types import HOST, PROVIDER, MODEL
+from machineconfig.scripts.python.helpers_agents.fire_agents_helper_types import AI_SPEC
 
 
-def fire_crush(api_key: Optional[str], model: MODEL, provider: PROVIDER, machine: HOST, prompt_path: Path, repo_root: Path) -> str:
-    match machine:
+def fire_crush(ai_spec: AI_SPEC, prompt_path: Path, repo_root: Path) -> str:
+    match ai_spec["machine"]:
         case "local":
             cmd = f"""
 crush run {prompt_path}
 """
         case "docker":
-            assert api_key is not None, "API key is required for Crush agent in docker mode."
+            assert ai_spec["api_key"] is not None, "API key is required for Crush agent in docker mode."
             json_path = Path(__file__).parent / "fire_crush.json"
             json_template = json_path.read_text(encoding="utf-8")
-            json_filled = json_template.replace("{api_key}", api_key).replace("{model}", model).replace("{provider}", provider)
-            import tempfile
-            temp_config_file_local = tempfile.mkstemp(suffix=".json")[1]
+            json_filled = json_template.replace("{api_key}", ai_spec["api_key"]).replace("{model}", ai_spec["model"]).replace("{provider}", ai_spec["provider"])
+            from machineconfig.utils.accessories import randstr
+            temp_config_file_local = Path.home().joinpath("tmp_results/tmp_files/crush_" + randstr(8) + ".json")
+            temp_config_file_local.parent.mkdir(parents=True, exist_ok=True)
             Path(temp_config_file_local).write_text(json_filled, encoding="utf-8")            
             cmd = f"""
 
 #   -e "PATH_PROMPT=$PATH_PROMPT"
-#   opencode --model "{provider}/{model}" run {prompt_path}
-
+#   opencode --model "{ai_spec["provider"]}/{ai_spec["model"]}" run {prompt_path}
+  
 
 echo "Running prompt @ {prompt_path.relative_to(repo_root)} using Docker with Crush..."
 docker run -it --rm \
   -v "{repo_root}:/workspace/{repo_root.name}" \
   -v "{temp_config_file_local}:/root/.local/share/crush/crush.json" \
   -w "/workspace/{repo_root.name}" \
-  statistician/machineconfig:latest \
+  statistician/machineconfig-ai:latest \
   bash -i -c "source ~/.bashrc && cd /workspace/{repo_root.name} && cat /root/.local/share/crush/crush.json && crush run 'Please act on contents of this prompt ./{prompt_path.relative_to(repo_root)}'"
 
 """

{machineconfig-6.85/src/machineconfig/scripts/python/helpers_fire → machineconfig-6.87/src/machineconfig/scripts/python/helpers_agents}/agentic_frameworks/fire_cursor_agents.py

@@ -2,11 +2,10 @@
 
 from pathlib import Path
 # import shlex
-from machineconfig.scripts.python.helpers_fire.fire_agents_helper_types import HOST
-from typing import Optional
+from machineconfig.scripts.python.helpers_agents.fire_agents_helper_types import AI_SPEC
 
-def fire_cursor(api_key: Optional[str], prompt_path: Path, machine: HOST) -> str:
-    match machine:
+def fire_cursor(ai_spec: AI_SPEC, prompt_path: Path) -> str:
+    match ai_spec["machine"]:
         case "local":
             # Export the environment variable so it's available to subshells
             cmd = f"""

{machineconfig-6.85/src/machineconfig/scripts/python/helpers_fire → machineconfig-6.87/src/machineconfig/scripts/python/helpers_agents}/agentic_frameworks/fire_gemini.py

@@ -1,26 +1,25 @@
 
 from pathlib import Path
 import shlex
-from machineconfig.scripts.python.helpers_fire.fire_agents_helper_types import HOST
-from typing import Optional, Literal
+from machineconfig.scripts.python.helpers_agents.fire_agents_helper_types import AI_SPEC
 
 
-def fire_gemini(api_key: Optional[str], model: Literal["gemini-2.5-pro"], provider: Literal["google"], machine: HOST, prompt_path: Path, repo_root: Path) -> str:
-    _ = provider
+def fire_gemini(ai_spec: AI_SPEC, prompt_path: Path, repo_root: Path) -> str:
+    _ = ai_spec["provider"]
     # model = "gemini-2.5-flash-lite"
     # model = None  # auto-select
     # if model is None:
     #     model_arg = ""
     # else:
-    model_arg = f"--model {shlex.quote(model)}"
+    model_arg = f"--model {shlex.quote(ai_spec['model'])}"
     # Need a real shell for the pipeline; otherwise '| gemini ...' is passed as args to 'cat'
     safe_path = shlex.quote(str(prompt_path))
 
-    match machine:
+    match ai_spec["machine"]:
         case "local":
             # Export the environment variable so it's available to subshells
-            if api_key is not None:
-                define_api_key = f"""export GEMINI_API_KEY="{shlex.quote(api_key)}" """
+            if ai_spec["api_key"] is not None:
+                define_api_key = f"""export GEMINI_API_KEY="{shlex.quote(ai_spec['api_key'])}" """
             else:
                 define_api_key = "echo 'Warning: No GEMINI_API_KEY provided, hoping it is set in the environment.'"
             cmd = f"""
@@ -31,14 +30,13 @@ gemini {model_arg} --yolo --prompt {safe_path}
             
 
         case "docker":
-            assert api_key is not None, "When using docker, api_key must be provided."
+            assert ai_spec["api_key"] is not None, "When using docker, api_key must be provided."
             cmd = f"""
 docker run -it --rm \
-  -e GEMINI_API_KEY="{api_key}" \
+  -e GEMINI_API_KEY="{ai_spec['api_key']}" \
   -v "{repo_root}:/workspace/{repo_root.name}" \
   -w "/workspace/{repo_root.name}" \
-  statistician/machineconfig:latest  \
+  statistician/machineconfig-ai:latest  \
   gemini --prompt "$PATH_PROMPT"
 """
     return cmd
-            

{machineconfig-6.85/src/machineconfig/scripts/python/helpers_fire → machineconfig-6.87/src/machineconfig/scripts/python/helpers_agents}/agentic_frameworks/fire_qwen.py

@@ -1,11 +1,10 @@
 
 from pathlib import Path
 import shlex
-from machineconfig.scripts.python.helpers_fire.fire_agents_helper_types import HOST
-from typing import Optional, Literal
+from machineconfig.scripts.python.helpers_agents.fire_agents_helper_types import AI_SPEC
 
 
-def fire_qwen(config_dir: Optional[str], model: Literal["qwen"], provider: Literal["qwen"], machine: HOST, prompt_path: Path, repo_root: Path) -> str:
+def fire_qwen(ai_spec: AI_SPEC, prompt_path: Path, repo_root: Path, config_dir: str | None) -> str:
     # assert model == "qwen", "Only qwen is supported currently."
     # assert provider == "qwen", "Only qwen is supported currently."
     # model = "qwen"
@@ -14,12 +13,12 @@ def fire_qwen(config_dir: Optional[str], model: Literal["qwen"], provider: Liter
     # if model is None:
     #     model_arg = ""
     # else:
-    _ = provider
+    _ = ai_spec["provider"]
     # model_arg = f"--model {shlex.quote(model)}"
     # Need a real shell for the pipeline; otherwise '| gemini ...' is passed as args to 'cat'
     safe_path = shlex.quote(str(prompt_path))
 
-    match machine:
+    match ai_spec["machine"]:
         case "local":
             # Export the environment variable so it's available to subshells
             cmd = f"""
@@ -37,7 +36,7 @@ docker run -it --rm \
   -v {shlex.quote(str(oauth_creds))}:/root/.qwen/oauth_creds.json \
   -v {shlex.quote(str(settings))}:/root/.qwen/settings.json \
   -w "/workspace/{repo_root.name}" \
-  statistician/machineconfig:latest \
+  statistician/machineconfig-ai:latest \
   qwen --prompt "$PATH_PROMPT"
 """
     return cmd

{machineconfig-6.85/src/machineconfig/scripts/python/helpers_fire → machineconfig-6.87/src/machineconfig/scripts/python/helpers_agents}/fire_agents_help_launch.py

@@ -2,7 +2,7 @@
 import random
 import shlex
 from pathlib import Path
-from machineconfig.scripts.python.helpers_fire.fire_agents_helper_types import AGENTS, AGENT_NAME_FORMATTER, HOST, PROVIDER, MODEL
+from machineconfig.scripts.python.helpers_agents.fire_agents_helper_types import AGENTS, AGENT_NAME_FORMATTER, HOST, PROVIDER, AI_SPEC
 
 
 def get_api_keys(provider: PROVIDER) -> list[str]:
@@ -20,7 +20,7 @@ def get_api_keys(provider: PROVIDER) -> list[str]:
 
 
 def prep_agent_launch(repo_root: Path, agents_dir: Path, prompts_material: list[str], prompt_prefix: str, keep_material_in_separate_file: bool,
-                      machine: HOST, model: MODEL, provider: PROVIDER, agent: AGENTS, *, job_name: str) -> None:
+                      machine: HOST, model: str, provider: PROVIDER, agent: AGENTS, *, job_name: str) -> None:
     agents_dir.mkdir(parents=True, exist_ok=True)
     prompt_folder = agents_dir / "prompts"
     prompt_folder.mkdir(parents=True, exist_ok=True)
@@ -66,17 +66,20 @@ sleep 0.1
                 assert provider == "google", "Gemini agent only works with google provider."
                 api_keys = get_api_keys(provider="google")
                 api_key = api_keys[idx % len(api_keys)] if len(api_keys) > 0 else None
-                from machineconfig.scripts.python.helpers_fire.agentic_frameworks.fire_gemini import fire_gemini
-                cmd = fire_gemini(api_key=api_key, prompt_path=prompt_path, machine=machine, model="gemini-2.5-pro", provider="google", repo_root=repo_root)
+                ai_spec: AI_SPEC = AI_SPEC(provider=provider, model="gemini-2.5-pro", agent=agent, machine=machine, api_key=api_key, api_name="gemini")
+                from machineconfig.scripts.python.helpers_agents.agentic_frameworks.fire_gemini import fire_gemini
+                cmd = fire_gemini(ai_spec=ai_spec, prompt_path=prompt_path, repo_root=repo_root)
             case "cursor-agent":
-                from machineconfig.scripts.python.helpers_fire.agentic_frameworks.fire_cursor_agents import fire_cursor
-                cmd = fire_cursor(prompt_path=prompt_path, machine=machine, api_key=None)
+                ai_spec: AI_SPEC = AI_SPEC(provider=provider, model=model, agent=agent, machine=machine, api_key=None, api_name="cursor")
+                from machineconfig.scripts.python.helpers_agents.agentic_frameworks.fire_cursor_agents import fire_cursor
+                cmd = fire_cursor(ai_spec=ai_spec, prompt_path=prompt_path)
                 raise NotImplementedError("Cursor agent is not implemented yet, api key missing")
             case "crush":
-                from machineconfig.scripts.python.helpers_fire.agentic_frameworks.fire_crush import fire_crush
                 api_keys = get_api_keys(provider=provider)
                 api_key = api_keys[idx % len(api_keys)] if len(api_keys) > 0 else None
-                cmd = fire_crush(api_key=api_key, prompt_path=prompt_path, machine=machine, repo_root=repo_root, model=model, provider=provider)
+                ai_spec: AI_SPEC = AI_SPEC(provider=provider, model=model, agent=agent, machine=machine, api_key=api_key, api_name="crush")
+                from machineconfig.scripts.python.helpers_agents.agentic_frameworks.fire_crush import fire_crush
+                cmd = fire_crush(ai_spec=ai_spec, prompt_path=prompt_path, repo_root=repo_root)
             # case "q":
             #     from machineconfig.scripts.python.helpers_fire.fire_q import fire_q
             #     cmd = fire_q(api_key="", prompt_path=prompt_path, machine=machine)

{machineconfig-6.85/src/machineconfig/scripts/python/helpers_fire → machineconfig-6.87/src/machineconfig/scripts/python/helpers_agents}/fire_agents_helper_types.py

@@ -19,24 +19,14 @@ from typing import Literal, TypeAlias, TypedDict
 AGENTS: TypeAlias = Literal["cursor-agent", "gemini", "qwen-code", "copilot", "crush", "q", "opencode", "kilocode", "cline", "auggie", "warp", "droid"]
 HOST: TypeAlias = Literal["local", "docker"]
 PROVIDER: TypeAlias = Literal["azure", "google", "aws", "openai", "anthropic", "openrouter", "xai"]
-MODEL: TypeAlias = Literal["zai/glm-4.6", "anthropic/sonnet-4.5", "google/gemini-2.5-pro", "openai/gpt-5-codex",
-                           "openrouter/supernova", "x-ai/grok-4-fast:free",
-                           ]
-PROVIDER2MODEL: dict[PROVIDER, list[MODEL]] = {
-    "azure": ["zai/glm-4.6"],
-    "google": ["google/gemini-2.5-pro"],
-    "aws": [],
-    "openai": ["openai/gpt-5-codex"],
-    "anthropic": ["anthropic/sonnet-4.5"],
-    "openrouter": ["openrouter/supernova"],
-    "xai": ["x-ai/grok-4-fast:free"]
-}
 
 class AI_SPEC(TypedDict):
     provider: PROVIDER
-    model: MODEL
+    model: str
     agent: AGENTS
-    machine: HOST    
+    machine: HOST
+    api_key: str | None
+    api_name: str
 
 
 AGENT_NAME_FORMATTER = "agent_{idx}_cmd.sh"  # e.g., agent_0_cmd.sh

machineconfig-6.87/src/machineconfig/scripts/python/helpers_agents/templates/prompt.txt

@@ -0,0 +1,6 @@
+
+please look if it is possible to easily relpace PathExtended with normal Path from pathlib
+if its one or two lines of code, then go ahead and make it standard and stop using the extended library
+you focus ont he methods used, 
+
+only look at the files below

machineconfig-6.87/src/machineconfig/scripts/python/helpers_agents/templates/template.sh

@@ -0,0 +1,24 @@
+
+#!/bin/bash
+# set -e # Exit immediately if a command exits with a non-zero status.
+
+JOB_NAME="outpatient_mapping"
+REPO_ROOT="$HOME/code/machineconfig"
+CONTEXT_PATH="$REPO_ROOT/.ai/todo/files.md"
+# agents make-todo --strategy keywords from machineconfig.utils.path_extended import PathExtended
+PROMPT_PATH="$REPO_ROOT/src/machineconfig/scripts/python/helpers_agents/templates/prompt.txt"
+AGENTS_DIR="$REPO_ROOT/.ai/agents/$JOB_NAME"
+
+agents create --agents crush \
+    --host docker \
+    --model x-ai/grok-4-fast:free \
+    --provider openrouter \
+    --context-path $CONTEXT_PATH \
+    --prompt-path $PROMPT_PATH \
+    --job-name $JOB_NAME \
+    --agents-dir $AGENTS_DIR
+sessions balance-load "$AGENTS_DIR/layout.json" --max-thresh 6 --breaking-method moreLayouts --thresh-type number --output-path "$AGENTS_DIR/layout_balanced.json"
+sessions run "$AGENTS_DIR/layout_balanced.json" --kill-upon-completion
+
+
+# agents collect $AGENTS_DIR "$REPO_ROOT/.ai/agents/$JOB_NAME/collected.txt"

{machineconfig-6.85 → machineconfig-6.87}/src/machineconfig/scripts/python/helpers_devops/cli_config.py

@@ -46,7 +46,7 @@ def path():
     uv_with = ["textual"]
     uv_project_dir = None
     if not Path.home().joinpath("code/machineconfig").exists():
-        uv_with.append("machineconfig>=6.85")
+        uv_with.append("machineconfig>=6.87")
     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-6.85 → machineconfig-6.87}/src/machineconfig/scripts/python/helpers_devops/cli_self.py

@@ -41,9 +41,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>=6.85" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=6.87" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.85" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.87" """)
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     if not no_copy_assets:
         create_default_shell_profile()   # involves copying assets too
@@ -68,7 +68,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>=6.85,textual" """
+    else: executable = """--with "machineconfig>=6.87,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-6.85 → machineconfig-6.87}/src/machineconfig/scripts/python/helpers_devops/cli_utils.py

@@ -219,3 +219,20 @@ uv add --group plot \
 """
     from machineconfig.utils.code import run_shell_script
     run_shell_script(script)
+# def add_dev_packages(repo_dir: Annotated[Optional[str], typer.Option(..., "--repo-dir", "-r", help="Path to the repository root directory")] = None):
+#     if repo_dir is None:
+#         r_dir = Path.cwd()
+#     else:
+#         r_dir = Path(repo_dir).resolve()
+#     if not r_dir.exists() or not r_dir.is_dir() or not (r_dir / "pyproject.toml").exists():
+#         typer.echo(f"❌ The provided repo directory `{r_dir}` is not valid or does not contain a `pyproject.toml` file.")
+#         raise typer.Exit(code=1)
+#     command = f"""
+# cd "{r_dir}" || exit 1
+# uv add nbformat ipdb ipykernel ipython pylint pyright mypy pyrefly ty pytest
+# """
+#     from machineconfig.utils.code import run_shell_script
+#     typer.echo(f"➡️  Installing dev packages in repo at `{r_dir}`...")
+#     run_shell_script(command)
+#     typer.echo(f"✅ Dev packages installed successfully in repo at `{r_dir}`.")
+#     # TODO: see upgrade packages.

machineconfig-6.85/src/machineconfig/scripts/python/helpers_fire/helpers4.py → machineconfig-6.87/src/machineconfig/scripts/python/helpers_fire_command/file_wrangler.py

@@ -1,7 +1,7 @@
-
 from typing import Optional
 import os
 from machineconfig.utils.path_extended import PathExtended
+import platform
 
 
 def search_for_files_of_interest(path_obj: PathExtended):
@@ -125,3 +125,42 @@ def wrap_import_in_try_except(import_line: str, pyfile: str, repo_root: Optional
             sys.path.append(repo_root)
         exec(f"from {Path(pyfile).stem} import *")
         print(fr"✅ Successfully imported `{pyfile}`")
+
+
+def add_to_path(path_variable: str, directory: str) -> str:
+    """
+    Generate shell script to add directory to path_variable.
+    Handles both Windows (cmd) and Unix-like systems (bash/zsh).
+    Checks if variable exists before appending, otherwise creates it.
+    """
+    system = platform.system()
+    
+    if system == "Windows":
+        script = f"""# Check if {path_variable} is defined
+if (Test-Path env:{path_variable}) {{
+    Write-Host "Adding {directory} to existing {path_variable}"
+    $currentValue = [Environment]::GetEnvironmentVariable("{path_variable}", "User")
+    $newValue = "$currentValue;{directory}"
+    [Environment]::SetEnvironmentVariable("{path_variable}", $newValue, "User")
+    $env:{path_variable} = $newValue
+}} else {{
+    Write-Host "Creating new {path_variable} variable"
+    [Environment]::SetEnvironmentVariable("{path_variable}", "{directory}", "User")
+    $env:{path_variable} = "{directory}"
+}}
+Write-Host "{path_variable} is now: $env:{path_variable}\""""
+        return script
+    else:
+        script = f"""#!/bin/bash
+# Check if {path_variable} is defined and not empty
+if [ -z "${{{path_variable}}}" ]; then
+    echo "Creating new {path_variable} variable"
+    export {path_variable}="{directory}"
+else
+    echo "Adding {directory} to existing {path_variable}"
+    export {path_variable}="${{{path_variable}}}:{directory}"
+fi
+echo "{path_variable} is now: ${{{path_variable}}}"
+"""
+        return script
+

{machineconfig-6.85 → machineconfig-6.87}/src/machineconfig/scripts/python/helpers_fire_command/fire_jobs_route_helper.py

@@ -22,7 +22,7 @@ def choose_function_or_lines(choice_file: PathExtended, kwargs_dict: dict[str, o
     choice_function: Optional[str] = None
     
     if choice_file.suffix == ".py":
-        from machineconfig.scripts.python.helpers_fire.helpers4 import parse_pyfile
+        from machineconfig.scripts.python.helpers_fire_command.file_wrangler import parse_pyfile
         options, func_args = parse_pyfile(file_path=str(choice_file))
         choice_function_tmp = choose_from_options(msg="Choose a function to run", options=options, fzf=True, multi=False)
         assert isinstance(choice_function_tmp, str), f"choice_function must be a string. Got {type(choice_function_tmp)}"

{machineconfig-6.85 → machineconfig-6.87}/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>=6.85"]
+        uv_with = ["machineconfig>=6.87"]
         uv_project_dir = None
 
     import tempfile

{machineconfig-6.85 → machineconfig-6.87}/src/machineconfig/scripts/python/helpers_sessions/sessions_multiprocess.py

@@ -21,7 +21,7 @@ def create_from_function(
         suffixes = {".py"}
         choice_file = match_file_name(sub_string=path, search_root=PathExtended.cwd(), suffixes=suffixes)
     elif path_obj.is_dir():
-        from machineconfig.scripts.python.helpers_fire.helpers4 import search_for_files_of_interest
+        from machineconfig.scripts.python.helpers_fire_command.file_wrangler import search_for_files_of_interest
         print(f"🔍 Searching recursively for Python, PowerShell and Shell scripts in directory `{path_obj}`")
         files = search_for_files_of_interest(path_obj)
         print(f"🔍 Got #{len(files)} results.")

{machineconfig-6.85 → machineconfig-6.87}/src/machineconfig/scripts/python/nw/mount_nfs

@@ -5,7 +5,7 @@
 # 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.85" python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with "machineconfig>=6.87" 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-6.85 → machineconfig-6.87}/src/machineconfig/scripts/python/sessions.py

@@ -51,7 +51,7 @@ def select_layout(layouts_json_file: Path, selected_layouts_names: Optional[list
 
 def find_layout_file(layout_path: str, ) -> Path:
     from machineconfig.utils.path_extended import PathExtended
-    from machineconfig.scripts.python.helpers_fire.helpers4 import search_for_files_of_interest
+    from machineconfig.scripts.python.helpers_fire_command.file_wrangler import search_for_files_of_interest
     from machineconfig.utils.options import choose_from_options
     from machineconfig.utils.path_helper import match_file_name, sanitize_path
     path_obj = sanitize_path(layout_path)

{machineconfig-6.85 → machineconfig-6.87}/src/machineconfig/scripts/python/utils.py

@@ -2,9 +2,7 @@
 
 from machineconfig.scripts.python.helpers_devops.cli_utils import download, merge_pdfs, get_machine_specs, init_project, compress_pdf
 import typer
-from typing import Annotated, Optional
-from pathlib import Path
-
+from typing import Annotated
 
 def kill_process(
         # name: Annotated[Optional[str], typer.Option(..., "--name", "-n", help="Name of the process to kill")],
@@ -21,31 +19,20 @@ def kill_process(
                         #    )
 
 
-def add_dev_packages(repo_dir: Annotated[Optional[str], typer.Option(..., "--repo-dir", "-r", help="Path to the repository root directory")] = None):
-    if repo_dir is None:
-        r_dir = Path.cwd()
-    else:
-        r_dir = Path(repo_dir).resolve()
-    if not r_dir.exists() or not r_dir.is_dir() or not (r_dir / "pyproject.toml").exists():
-        typer.echo(f"❌ The provided repo directory `{r_dir}` is not valid or does not contain a `pyproject.toml` file.")
-        raise typer.Exit(code=1)
-    command = f"""
-cd "{r_dir}" || exit 1
-uv add nbformat ipdb ipykernel ipython pylint pyright mypy pyrefly ty pytest
-"""
-    from machineconfig.utils.code import run_shell_script
-    typer.echo(f"➡️  Installing dev packages in repo at `{r_dir}`...")
-    run_shell_script(command)
-    typer.echo(f"✅ Dev packages installed successfully in repo at `{r_dir}`.")
-    # TODO: see upgrade packages.
-
-
+def upgrade_packages():
+    from machineconfig.utils.upgrade_packages import generate_uv_add_commands
+    from pathlib import Path
+    generate_uv_add_commands(pyproject_path=Path.cwd() / "pyproject.toml", output_path=Path.cwd() / "pyproject_init.sh")
 
 
 def get_app() -> typer.Typer:
     app = typer.Typer(help="🛠️ utilities operations", no_args_is_help=True, add_help_option=False, add_completion=False)
     app.command(name="kill-process", no_args_is_help=False, help="[k] Choose a process to kill")(kill_process)
     app.command(name="k", no_args_is_help=False, help="Choose a process to kill", hidden=True)(kill_process)
+
+    app.command(name="upgrade-packages", no_args_is_help=False, help="[up] Upgrade project dependencies.")(upgrade_packages)
+    app.command(name="up", no_args_is_help=False, hidden=True)(upgrade_packages)
+
     app.command(name="download", no_args_is_help=True, help="[d] Download a file from a URL and optionally decompress it.")(download)
     app.command(name="d", no_args_is_help=True, hidden=True)(download)
     app.command(name="get-machine-specs", no_args_is_help=False, help="[g] Get machine specifications.")(get_machine_specs)