machineconfig 6.84__py3-none-any.whl → 6.86__py3-none-any.whl

machineconfig/cluster/sessions_managers/wt_utils/wt_helpers.py

@@ -0,0 +1,199 @@
+import subprocess
+import random
+import string
+import json
+import shlex
+import logging
+from typing import Any
+from pathlib import Path
+
+from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
+
+logger = logging.getLogger(__name__)
+
+POWERSHELL_CMD = "powershell" if __import__("platform").system().lower() == "windows" else "pwsh"
+
+
+def generate_random_suffix(length: int) -> str:
+    """Generate a random string suffix for unique PowerShell script names."""
+    return "".join(random.choices(string.ascii_lowercase + string.digits, k=length))
+
+
+def parse_command(command: str) -> tuple[str, list[str]]:
+    try:
+        parts = shlex.split(command)
+        if not parts:
+            raise ValueError("Empty command provided")
+        return parts[0], parts[1:] if len(parts) > 1 else []
+    except ValueError as e:
+        logger.error(f"Error parsing command '{command}': {e}")
+        parts = command.split()
+        return parts[0] if parts else "", parts[1:] if len(parts) > 1 else []
+
+
+def escape_for_wt(text: str) -> str:
+    """Escape text for use in Windows Terminal commands."""
+    text = text.replace('"', '""')
+    if " " in text or ";" in text or "&" in text or "|" in text:
+        return f'"{text}"'
+    return text
+
+
+def validate_layout_config(layout_config: LayoutConfig) -> None:
+    """Validate layout configuration format and content."""
+    if not layout_config["layoutTabs"]:
+        raise ValueError("Layout must contain at least one tab")
+    for tab in layout_config["layoutTabs"]:
+        if not tab["tabName"].strip():
+            raise ValueError(f"Invalid tab name: {tab['tabName']}")
+        if not tab["command"].strip():
+            raise ValueError(f"Invalid command for tab '{tab['tabName']}': {tab['command']}")
+        if not tab["startDir"].strip():
+            raise ValueError(f"Invalid startDir for tab '{tab['tabName']}': {tab['startDir']}")
+
+
+def generate_wt_command_string(layout_config: LayoutConfig, window_name: str) -> str:
+    """Generate complete Windows Terminal command string."""
+    command_parts = []
+    
+    for i, tab in enumerate(layout_config["layoutTabs"]):
+        is_first = i == 0
+        
+        if is_first:
+            tab_parts = ["wt", "-w", escape_for_wt(window_name)]
+        else:
+            tab_parts = ["new-tab"]
+        
+        tab_name = tab["tabName"]
+        cwd = tab["startDir"]
+        command = tab["command"]
+        
+        if cwd.startswith("~/"):
+            cwd = cwd.replace("~/", f"{Path.home()}/")
+        elif cwd == "~":
+            cwd = str(Path.home())
+        
+        tab_parts.extend(["-d", escape_for_wt(cwd)])
+        tab_parts.extend(["--title", escape_for_wt(tab_name)])
+        tab_parts.append("--")
+        
+        # Split the command into arguments
+        command_args = shlex.split(command)
+        tab_parts.extend(command_args)
+        
+        command_parts.append(" ".join(tab_parts))
+    
+    return " `; ".join(command_parts)
+
+
+def check_wt_session_status(session_name: str) -> dict[str, Any]:
+    try:
+        ps_script = """
+try {
+    $wtProcesses = Get-Process -Name 'WindowsTerminal' -ErrorAction SilentlyContinue
+    if ($wtProcesses) {
+        $processInfo = @()
+        $wtProcesses | ForEach-Object {
+            $info = @{
+                "Id" = $_.Id
+                "ProcessName" = $_.ProcessName
+                "StartTime" = $_.StartTime.ToString()
+            }
+            $processInfo += $info
+        }
+        $processInfo | ConvertTo-Json -Depth 2
+    }
+} catch {
+    # No Windows Terminal processes found
+}
+"""
+
+        result = subprocess.run([POWERSHELL_CMD, "-Command", ps_script], capture_output=True, text=True, timeout=5)
+
+        if result.returncode == 0:
+            output = result.stdout.strip()
+            if output and output != "":
+                try:
+                    processes = json.loads(output)
+                    if not isinstance(processes, list):
+                        processes = [processes]
+
+                    return {"wt_running": True, "session_exists": len(processes) > 0, "session_name": session_name, "all_windows": processes, "session_windows": processes}
+                except Exception as e:
+                    return {"wt_running": True, "session_exists": False, "error": f"Failed to parse process info: {e}", "session_name": session_name}
+            else:
+                return {"wt_running": False, "session_exists": False, "session_name": session_name, "all_windows": []}
+        else:
+            return {"wt_running": False, "error": result.stderr, "session_name": session_name}
+
+    except subprocess.TimeoutExpired:
+        return {"wt_running": False, "error": "Timeout while checking Windows Terminal processes", "session_name": session_name}
+    except FileNotFoundError:
+        return {"wt_running": False, "error": f"PowerShell ({POWERSHELL_CMD}) not found in PATH", "session_name": session_name}
+    except Exception as e:
+        return {"wt_running": False, "error": str(e), "session_name": session_name}
+
+
+def check_command_status(tab_name: str, layout_config: LayoutConfig) -> dict[str, Any]:
+    """Check if a command is running by looking for processes."""
+    tab_config = None
+    for tab in layout_config["layoutTabs"]:
+        if tab["tabName"] == tab_name:
+            tab_config = tab
+            break
+
+    if tab_config is None:
+        return {"status": "unknown", "error": f"Tab '{tab_name}' not found in layout config", "running": False, "pid": None, "command": None}
+
+    command = tab_config["command"]
+
+    try:
+        primary_cmd = command.split()[0] if command.strip() else ""
+        if not primary_cmd:
+            return {"status": "error", "error": "Empty command", "running": False, "command": command, "tab_name": tab_name}
+
+        ps_script = f"""
+try {{
+    $processes = Get-Process -Name '{primary_cmd}' -ErrorAction SilentlyContinue
+    if ($processes) {{
+        $processes | ForEach-Object {{
+            $procInfo = @{{
+                "pid" = $_.Id
+                "name" = $_.ProcessName
+                "start_time" = $_.StartTime.ToString()
+            }}
+            Write-Output ($procInfo | ConvertTo-Json -Compress)
+        }}
+    }}
+}} catch {{
+    # No processes found or other error
+}}
+"""
+
+        result = subprocess.run([POWERSHELL_CMD, "-Command", ps_script], capture_output=True, text=True, timeout=5)
+
+        if result.returncode == 0:
+            output_lines = [line.strip() for line in result.stdout.strip().split("\n") if line.strip()]
+            matching_processes = []
+
+            for line in output_lines:
+                if line.startswith("{") and line.endswith("}"):
+                    try:
+                        proc_info = json.loads(line)
+                        matching_processes.append(proc_info)
+                    except json.JSONDecodeError:
+                        continue
+
+            if matching_processes:
+                return {"status": "running", "running": True, "processes": matching_processes, "command": command, "tab_name": tab_name}
+            else:
+                return {"status": "not_running", "running": False, "processes": [], "command": command, "tab_name": tab_name}
+        else:
+            return {"status": "error", "error": f"Command failed: {result.stderr}", "running": False, "command": command, "tab_name": tab_name}
+
+    except subprocess.TimeoutExpired:
+        logger.error(f"Timeout checking command status for tab '{tab_name}'")
+        return {"status": "timeout", "error": "Timeout checking process status", "running": False, "command": command, "tab_name": tab_name}
+    except Exception as e:
+        logger.error(f"Error checking command status for tab '{tab_name}': {e}")
+        return {"status": "error", "error": str(e), "running": False, "command": command, "tab_name": tab_name}

machineconfig/scripts/python/agents.py

@@ -5,7 +5,7 @@
 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, MODEL, PROVIDER
 
 
 def create(
@@ -24,11 +24,22 @@ 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.scripts.python.helpers_agents.fire_agents_helper_types import PROVIDER2MODEL
     from machineconfig.utils.accessories import get_repo_root, randstr
     import json
 
+    # validate model is valid for the provider
+    valid_models_for_provider = PROVIDER2MODEL.get(provider, [])
+    if model not in valid_models_for_provider:
+        available_models = "\n  ".join(valid_models_for_provider) if valid_models_for_provider else "(none configured)"
+        raise typer.BadParameter(
+            f"Model '{model}' is not valid for provider '{provider}'.\n"
+            f"Valid models for '{provider}':\n  {available_models}\n"
+            f"All available models: {', '.join(get_args(MODEL))}"
+        )
+
     # validate mutual exclusive
     prompt_options = [prompt, prompt_path]
     provided_prompt = [opt for opt in prompt_options if opt is not None]
@@ -85,7 +96,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 +147,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()}")
 

machineconfig/scripts/python/ai/vscode_tasks.py

@@ -1,5 +1,6 @@
 import json
 from pathlib import Path
+from typing import Any
 
 
 def add_lint_and_type_check_task(repo_root: Path) -> None:
@@ -18,8 +19,12 @@ def add_lint_and_type_check_task(repo_root: Path) -> None:
     }
 
     if tasks_json_path.exists():
-        with tasks_json_path.open("r") as f:
-            tasks_config = json.load(f)
+        json_data = tasks_json_path.read_text(encoding="utf-8")
+        if not json_data.strip():
+            tasks_config: dict[str, Any] = {"version": "2.0.0", "tasks": []}
+        else:
+            tasks_config = json.loads(json_data)
+            assert isinstance(tasks_config, dict)
         if "tasks" not in tasks_config:
             tasks_config["tasks"] = []
         existing_labels = {task.get("label") for task in tasks_config.get("tasks", [])}

machineconfig/scripts/python/env_manager/path_manager_tui.py

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

machineconfig/scripts/python/fire_jobs.py

@@ -7,7 +7,7 @@ fire
 
 """
 
-from machineconfig.utils.ve import get_ve_activate_line, get_ve_path_and_ipython_profile
+from machineconfig.utils.ve import get_ve_path_and_ipython_profile
 from machineconfig.utils.options import choose_from_options
 from machineconfig.utils.path_helper import match_file_name, sanitize_path
 from machineconfig.utils.path_extended import PathExtended
@@ -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.")
@@ -38,10 +38,6 @@ 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}")
-    ve_root_from_file, ipy_profile = get_ve_path_and_ipython_profile(choice_file)
-    if ipy_profile is None:
-        ipy_profile = "default"
-
     if args.marimo:
         tmp_dir = PathExtended.tmp().joinpath(f"tmp_scripts/marimo/{choice_file.stem}_{randstr()}")
         tmp_dir.mkdir(parents=True, exist_ok=True)
@@ -58,15 +54,9 @@ 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
-        ve_root = args.ve or ve_root_from_file
-        if ve_root is None:
-            raise ValueError(f"Could not determine virtual environment for file {choice_file}. Please ensure it is within a recognized project structure or specify the `--ve` option.")
-        activate_ve_line = get_ve_activate_line(ve_root=ve_root)
     else:
-        activate_ve_line = ""
         kwargs_dict = {}
 
-
     # =========================  choosing function to run
     choice_function: Optional[str] = None  # Initialize to avoid unbound variable
     if args.choose_function:
@@ -77,58 +67,35 @@ 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
-        if args.streamlit:  exe = get_command_streamlit(choice_file, args.environment, repo_root)
-        elif args.interactive is False: exe = "python"
-        elif args.jupyter: exe = "jupyter-lab"
-        else: exe = f"ipython -i --no-banner --profile {ipy_profile} "
+        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"
+        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} "
+            else:
+                exe = "uv run 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
-        import_line = get_import_module_code(str(choice_file))
-        if repo_root is not None:
-            repo_root_add = f"""sys.path.append(r'{repo_root}')"""
-        else:
-            repo_root_add = ""
-        txt: str = f"""
-try:
-    {import_line}
-except (ImportError, ModuleNotFoundError) as ex:
-    print(fr"❌ Failed to import `{choice_file}` as a module: {{ex}} ")
-    print(fr"⚠️ Attempting import with ad-hoc `$PATH` manipulation. DO NOT pickle any objects in this session as correct deserialization cannot be guaranteed.")
-    import sys
-    sys.path.append(r'{PathExtended(choice_file).parent}')
-    {repo_root_add}
-    from {PathExtended(choice_file).stem} import *
-    print(fr"✅ Successfully imported `{choice_file}`")
-"""
-        if choice_function is not None:
-            txt = (
-                txt
-                + f"""
-res = {choice_function}({("**" + str(kwargs_dict)) if kwargs_dict else ""})
-"""
-            )
-
-        txt = (
-            f"""
-try:
-    from rich.panel import Panel
-    from rich.console import Console
-    from rich.syntax import Syntax
-    console = Console()
-    console.print(Panel(Syntax(code=r'''{txt}''', lexer='python'), title='Import Script'), style="bold red")
-except ImportError as _ex:
-    print(r'''{txt}''')
-"""
-            + txt
-        )
-        choice_file = PathExtended.tmp().joinpath(f"tmp_scripts/python/{PathExtended(choice_file).parent.name}_{PathExtended(choice_file).stem}_{randstr()}.py")
+        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))
+        import_code_robust = lambda_to_python_script(lambda: wrap_import_in_try_except(import_line=import_code, pyfile=str(choice_file), repo_root=str(repo_root) if repo_root is not None else None), in_global=True, import_module=False)
+        code_printing = lambda_to_python_script(lambda: print_code(code=import_code_robust, lexer="python", desc="import code"), in_global=True, import_module=False)
+        if choice_function is not None: calling = f"""res = {choice_function}({("**" + str(kwargs_dict)) if kwargs_dict else ""})"""
+        else: calling = """# No function selected to call. You can add your code here."""
+        choice_file = Path.home().joinpath(f"tmp_results/tmp_scripts/python/{Path(choice_file).parent.name}_{Path(choice_file).stem}_{randstr()}.py")
         choice_file.parent.mkdir(parents=True, exist_ok=True)
-        choice_file.write_text(txt, encoding="utf-8")
+        choice_file.write_text(import_code_robust + "\n" + code_printing + "\n" + calling, encoding="utf-8")
 
     # =========================  determining basic command structure: putting together exe & choice_file & choice_function & pdb
     if args.debug:
@@ -149,26 +116,24 @@ except ImportError as _ex:
             command = f"{exe} {choice_file}"
         else:
             command = f"cd {choice_file.parent}\n{exe} {choice_file.name}\ncd {PathExtended.cwd()}"
-
     elif args.cmd:
         command = rf""" cd /d {choice_file.parent} & {exe} {choice_file.name} """
     else:
         if choice_file.suffix == "": command = f"{exe} {choice_file} {fire_args}"
         else: command = f"{exe} {choice_file} "
 
-    if not args.cmd: command = f"{activate_ve_line}\n{command}"
+
+    if not args.cmd: pass
     else:
         new_line = "\n"
-        command = rf"""start cmd -Argument "/k {activate_ve_line.replace(".ps1", ".bat").replace(". ", "")} & {command.replace(new_line, " & ")} " """  # this works from powershell
+        command = rf"""start cmd -Argument "/k {command.replace(new_line, " & ")} " """  # this works from powershell
     if args.submit_to_cloud:
-        command = f"""
-{activate_ve_line}
-python -m machineconfig.cluster.templates.cli_click --file {choice_file} """
+        command = f"""uv run python -m machineconfig.cluster.templates.cli_click --file {choice_file} """
         if choice_function is not None:
             command += f"--function {choice_function} "
 
-    if args.optimized:
-        command = command.replace("python ", "python -OO ")
+    if args.optimized: command = command.replace("python ", "python -OO ")
+
     from rich.panel import Panel
     from rich.console import Console
     from rich.syntax import Syntax
@@ -207,7 +172,7 @@ python -m machineconfig.cluster.templates.cli_click --file {choice_file} """
     import os
     op_program_path = os.environ.get("OP_PROGRAM_PATH", None)
     if op_program_path is not None:
-        op_program_path = PathExtended(op_program_path)
+        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:

machineconfig/scripts/python/{helpers_fire → helpers_agents}/agentic_frameworks/fire_crush.py

@@ -2,7 +2,7 @@
 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 HOST, PROVIDER, MODEL
 
 
 def fire_crush(api_key: Optional[str], model: MODEL, provider: PROVIDER, machine: HOST, prompt_path: Path, repo_root: Path) -> str:
@@ -16,21 +16,22 @@ crush run {prompt_path}
             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]
+            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}
-
+  
 
 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/scripts/python/{helpers_fire → helpers_agents}/agentic_frameworks/fire_cursor_agents.py

@@ -2,7 +2,7 @@
 
 from pathlib import Path
 # import shlex
-from machineconfig.scripts.python.helpers_fire.fire_agents_helper_types import HOST
+from machineconfig.scripts.python.helpers_agents.fire_agents_helper_types import HOST
 from typing import Optional
 
 def fire_cursor(api_key: Optional[str], prompt_path: Path, machine: HOST) -> str:

machineconfig/scripts/python/{helpers_fire → helpers_agents}/agentic_frameworks/fire_gemini.py

@@ -1,7 +1,7 @@
 
 from pathlib import Path
 import shlex
-from machineconfig.scripts.python.helpers_fire.fire_agents_helper_types import HOST
+from machineconfig.scripts.python.helpers_agents.fire_agents_helper_types import HOST
 from typing import Optional, Literal
 
 
@@ -37,8 +37,7 @@ docker run -it --rm \
   -e GEMINI_API_KEY="{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/scripts/python/{helpers_fire → helpers_agents}/agentic_frameworks/fire_qwen.py

@@ -1,7 +1,7 @@
 
 from pathlib import Path
 import shlex
-from machineconfig.scripts.python.helpers_fire.fire_agents_helper_types import HOST
+from machineconfig.scripts.python.helpers_agents.fire_agents_helper_types import HOST
 from typing import Optional, Literal
 
 
@@ -37,7 +37,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/scripts/python/{helpers_fire → 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, MODEL
 
 
 def get_api_keys(provider: PROVIDER) -> list[str]:
@@ -66,14 +66,14 @@ 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
+                from machineconfig.scripts.python.helpers_agents.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)
             case "cursor-agent":
-                from machineconfig.scripts.python.helpers_fire.agentic_frameworks.fire_cursor_agents import fire_cursor
+                from machineconfig.scripts.python.helpers_agents.agentic_frameworks.fire_cursor_agents import fire_cursor
                 cmd = fire_cursor(prompt_path=prompt_path, machine=machine, api_key=None)
                 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
+                from machineconfig.scripts.python.helpers_agents.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)

machineconfig/scripts/python/{helpers_fire → helpers_agents}/fire_agents_helper_types.py

@@ -20,7 +20,7 @@ AGENTS: TypeAlias = Literal["cursor-agent", "gemini", "qwen-code", "copilot", "c
 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",
+                           "openrouter/supernova", "openrouter/andromeda-alpha", "x-ai/grok-4-fast:free",
                            ]
 PROVIDER2MODEL: dict[PROVIDER, list[MODEL]] = {
     "azure": ["zai/glm-4.6"],
@@ -28,7 +28,7 @@ PROVIDER2MODEL: dict[PROVIDER, list[MODEL]] = {
     "aws": [],
     "openai": ["openai/gpt-5-codex"],
     "anthropic": ["anthropic/sonnet-4.5"],
-    "openrouter": ["openrouter/supernova"],
+    "openrouter": ["openrouter/supernova", "openrouter/andromeda-alpha"],
     "xai": ["x-ai/grok-4-fast:free"]
 }
 

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/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/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.84")
+        uv_with.append("machineconfig>=6.86")
     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])