machineconfig 5.27__py3-none-any.whl → 5.28__py3-none-any.whl

machineconfig/scripts/cloud/init.sh

@@ -1,12 +1,8 @@
 #!/bin/bash
-#=======================================================================
 # ☁️ CLOUD CONFIGURATION INITIALIZATION SCRIPT ☁️
-#=======================================================================
 # This script initializes cloud configuration settings and sets up the environment
 
-echo """#=======================================================================
-🔑 COLLECTING CONFIGURATION PARAMETERS | Setting up cloud environment
-#=======================================================================
+echo """🔑 COLLECTING CONFIGURATION PARAMETERS | Setting up cloud environment
 """
 
 # Check for required environment variables and prompt if not set
@@ -41,9 +37,7 @@ if [ -z "$DECRYPTION_PASSWORD" ]; then
     echo ""
 fi
 
-echo """#=======================================================================
-📦 INSTALLING ESSENTIALS | Setting up core dependencies
-#=======================================================================
+echo """📦 INSTALLING ESSENTIALS | Setting up core dependencies
 """
 
 # Set up package manager
@@ -65,9 +59,7 @@ echo "🚀 Activating Python virtual environment..."
 echo "📋 Setting up code repositories..."
 curl bit.ly/cfgreposlinux -L | bash
 
-echo """#=======================================================================
-⚙️ CONFIGURING ENVIRONMENT | Setting up dotfiles
-#=======================================================================
+echo """⚙️ CONFIGURING ENVIRONMENT | Setting up dotfiles
 """
 
 # Link configuration files
@@ -87,9 +79,7 @@ source ~/code/machineconfig/src/machineconfig/setup_linux/symlinks.sh
 echo "🔄 Reloading shell configuration..."
 . ~/.bashrc
 
-echo """#=======================================================================
-📦 INSTALLING DEVELOPMENT TOOLS | Setting up development environment
-#=======================================================================
+echo """📦 INSTALLING DEVELOPMENT TOOLS | Setting up development environment
 """
 
 # Activate virtual environment
@@ -104,16 +94,12 @@ python -m fire machineconfig.scripts.python.devops_devapps_install main --which=
 echo "🔄 Reloading shell configuration..."
 . ~/.bashrc
 
-echo """#=======================================================================
-✅ FINALIZING CONFIGURATION | Running cloud-specific initialization
-#=======================================================================
+echo """✅ FINALIZING CONFIGURATION | Running cloud-specific initialization
 """
 
 # Run cloud-specific initialization script
 echo "⚙️ Running cloud-specific configuration: $CLOUD_CONFIG_NAME"
 . $HOME/dotfiles/config/cloud/$CLOUD_CONFIG_NAME/init.sh
 
-echo """#=======================================================================
-✅ INITIALIZATION COMPLETE | Cloud environment has been set up successfully
-#=======================================================================
+echo """✅ INITIALIZATION COMPLETE | Cloud environment has been set up successfully
 """

machineconfig/scripts/linux/share_cloud.sh

@@ -1,16 +1,12 @@
 #!/bin/bash
-#=======================================================================
 # 📤 CLOUD FILE SHARING SCRIPT 📤
-#=======================================================================
 # This script uploads files or directories to transfer.sh for easy sharing
 # Usage: share_cloud <file|directory> or command | share_cloud <file_name>
 
 # Check if arguments are provided
 if [ $# -eq 0 ]; then
-    echo """    #=======================================================================
-    ❌ ERROR | No arguments specified
-    #=======================================================================
-    
+    echo """        ❌ ERROR | No arguments specified
+        
     📋 USAGE:
       share_cloud <file|directory>
       command | share_cloud <file_name>
@@ -26,19 +22,15 @@ if tty -s; then
     
     # Check if the file exists
     if [ ! -e "$file" ]; then
-        echo """        #=======================================================================
-        ❌ ERROR | File not found
-        #=======================================================================
-        
+        echo """                ❌ ERROR | File not found
+                
         🔍 File \"$file\" does not exist
         """>&2
         return 1
     fi
     
-    echo """    #=======================================================================
-    📤 UPLOADING | Sharing file to transfer.sh
-    #=======================================================================
-    """
+    echo """        📤 UPLOADING | Sharing file to transfer.sh
+        """
     
     # Handle directories by creating a zip archive
     if [ -d "$file" ]; then
@@ -53,23 +45,17 @@ if tty -s; then
 else
     # Pipe mode - reading from stdin
     file_name=$1
-    echo """    #=======================================================================
-    📤 UPLOADING | Sharing from stdin to transfer.sh
-    #=======================================================================
-    """
+    echo """        📤 UPLOADING | Sharing from stdin to transfer.sh
+        """
     echo "📋 Creating file \"$file_name\" from piped input..."
     curl --progress-bar --upload-file "-" "https://transfer.sh/$file_name" | tee /dev/null
     
     # Display QR code for the URL
-    echo """    #=======================================================================
-    📱 QR CODE | Scan with mobile device to access file
-    #=======================================================================
-    """
+    echo """        📱 QR CODE | Scan with mobile device to access file
+        """
     qr "https://transfer.sh/$file_name"
 fi
 
-echo """#=======================================================================
-✅ UPLOAD COMPLETE | File is available at the URL above
-#=======================================================================
+echo """✅ UPLOAD COMPLETE | File is available at the URL above
 """
 echo "⚠️ NOTE: Files are automatically deleted after 14 days"

machineconfig/scripts/python/agents.py

@@ -5,7 +5,7 @@
 from pathlib import Path
 from typing import cast, Iterable, Optional, get_args
 import typer
-from machineconfig.scripts.python.helpers_fire.fire_agents_helper_types import AGENTS
+from machineconfig.scripts.python.helpers_fire.fire_agents_helper_types import AGENTS, MATCHINE, MODEL, PROVIDER
 
 
 def _write_list_file(target: Path, files: Iterable[Path]) -> None:
@@ -19,11 +19,16 @@ def create(
     filename_pattern: Optional[str] = typer.Option(None, help="Filename pattern to match"),
     separator: str = typer.Option("\n", help="Separator for context"),
     tasks_per_prompt: int = typer.Option(13, help="Number of tasks per prompt"),
+
     agent: AGENTS = typer.Option(..., help=f"Agent type. One of {', '.join(get_args(AGENTS))}"),
+    machine: MATCHINE = typer.Option(..., help=f"Machine to run agents on. One of {', '.join(get_args(MATCHINE))}"),
+    model: MODEL = typer.Option(..., help=f"Model to use (for crush agent). One of {', '.join(get_args(MODEL))}"),
+    provider: PROVIDER = typer.Option(..., help=f"Provider to use (for crush agent). One of {', '.join(get_args(PROVIDER))}"),
+
     prompt: Optional[str] = typer.Option(None, help="Prompt prefix as string"),
     prompt_path: Optional[Path] = typer.Option(None, help="Path to prompt file"),
     job_name: str = typer.Option("AI_Agents", help="Job name"),
-    keep_separate: bool = typer.Option(True, help="Keep prompt material in separate file to the context."),
+    separate_prompt_from_context: bool = typer.Option(True, help="Keep prompt material in separate file to the context."),
     output_path: Optional[Path] = typer.Option(None, help="Path to write the layout.json file"),
     agents_dir: Optional[Path] = typer.Option(None, help="Directory to store agent files. If not provided, will be constructed automatically."),
 ):
@@ -84,14 +89,17 @@ def create(
     else:
         prompt_prefix = cast(str, prompt)
     agent_selected = agent
-    keep_material_in_separate_file_input = keep_separate
+    keep_material_in_separate_file_input = separate_prompt_from_context
     prompt_material_re_splitted = chunk_prompts(prompt_material_path, tasks_per_prompt=tasks_per_prompt, joiner=separator)
     if agents_dir is None: agents_dir = repo_root / ".ai" / f"tmp_prompts/{job_name}_{randstr()}"
     else:
         import shutil
         if agents_dir.exists():
             shutil.rmtree(agents_dir)
-    prep_agent_launch(agents_dir=agents_dir, prompts_material=prompt_material_re_splitted, keep_material_in_separate_file=keep_material_in_separate_file_input, prompt_prefix=prompt_prefix, agent=agent_selected, job_name=job_name)
+    prep_agent_launch(repo_root=repo_root, agents_dir=agents_dir, prompts_material=prompt_material_re_splitted,
+                      keep_material_in_separate_file=keep_material_in_separate_file_input,
+                      prompt_prefix=prompt_prefix, machine=machine, agent=agent_selected, model=model, provider=provider,
+                      job_name=job_name)
     layoutfile = get_agents_launch_layout(session_root=agents_dir)    
     regenerate_py_code = f"""
 #!/usr/bin/env uv run --python 3.13 --with machineconfig
@@ -100,10 +108,11 @@ fire_agents create --context-path "{prompt_material_path}" \\
     --{search_strategy} "{context_path or keyword_search or filename_pattern}" \\
     --prompt-path "{prompt_path or ''}" \\
     --agent "{agent_selected}" \\
+    --machine "{machine}" \\
     --job-name "{job_name}" \\
     --tasks-per-prompt {tasks_per_prompt} \\
     --separator "{separator}" \\
-    {"--keep-separate" if keep_material_in_separate_file_input else ""}
+    {"--separate-prompt-from-context" if keep_material_in_separate_file_input else ""}
 """
     (agents_dir / "aa_agents_relaunch.py").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"
@@ -155,30 +164,12 @@ def collect(
 
 
 def template():
-    template_bash = """#!/bin/bash
-JOB_NAME="outpatient_mapping"
-REPO_ROOT="$HOME/code/work/winter_planning/"
-CONTEXT_PATH="$REPO_ROOT/data/outpatient_mapping/op_services_collected.csv"
-PROMPT_PATH="$REPO_ROOT/data/outpatient_mapping/prompt"
-
-AGENTS_DIR="$REPO_ROOT/.ai/agents/$JOB_NAME"
-LAYOUT_PATH="$REPO_ROOT/.ai/agents/$JOB_NAME/layout_unbalanced.json"
-LAYOUT_BALANCED_PATH="$REPO_ROOT/.ai/agents/$JOB_NAME/layout_balanced.json"
-
-agents create --context-path $CONTEXT_PATH --tasks-per-prompt 10 --agent crush --prompt-path $PROMPT_PATH --keep-separate --output-path $LAYOUT_PATH --agents-dir $AGENTS_DIR
-sessions balance-load $LAYOUT_PATH --max-thresh 6 --breaking-method moreLayouts --thresh-type number  --output-path $LAYOUT_BALANCED_PATH
-
-sessions run $LAYOUT_BALANCED_PATH --kill-upon-completion
-agents collect $AGENTS_DIR "$REPO_ROOT/.ai/agents/$JOB_NAME/collected.txt"
-"""
-    template_powershell = """
-
-"""
     from platform import system
-    if system() == "Linux":
-        template = template_bash
+    import machineconfig.scripts.python.helpers_fire as module
+    if system() == "Linux" or system() == "Darwin":
+        template_path = Path(module.__file__).parent / "template.sh"
     elif system() == "Windows":
-        template = template_powershell
+        template_path = Path(module.__file__).parent / "template.ps1"
     else:
         raise typer.BadParameter(f"Unsupported OS: {system()}")
 
@@ -189,16 +180,16 @@ agents collect $AGENTS_DIR "$REPO_ROOT/.ai/agents/$JOB_NAME/collected.txt"
         raise typer.Exit(1)
     save_path = repo_root / ".ai" / "agents" / "template_fire_agents.sh"
     save_path.parent.mkdir(parents=True, exist_ok=True)
-    save_path.write_text(template, encoding="utf-8")
+    save_path.write_text(template_path.read_text(encoding="utf-8"), encoding="utf-8")
     typer.echo(f"Template bash script written to {save_path}")
 
 
 def main_from_parser():
     import sys
     agents_app = typer.Typer(help="🤖 AI Agents management subcommands")
-    agents_app.command("create")(create)
-    agents_app.command("collect")(collect)
-    agents_app.command("template")(template)
+    agents_app.command("create", no_args_is_help=True)(create)
+    agents_app.command("collect", no_args_is_help=True)(collect)
+    agents_app.command("create-template", no_args_is_help=False, help="Create a template for fire agents")(template)
     if len(sys.argv) == 1:
         agents_app(["--help"])
     else:

machineconfig/scripts/python/cloud_repo_sync.py

@@ -3,31 +3,31 @@ from rich.console import Console
 from rich.panel import Panel
 import typer
 
-from machineconfig.utils.io import read_ini
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.terminal import Response
 from machineconfig.utils.source_of_truth import CONFIG_PATH, DEFAULTS_PATH
-from machineconfig.utils.options import choose_from_options
 from machineconfig.utils.code import get_shell_file_executing_python_script, write_shell_script_to_file
 
 import platform
 import subprocess
 from typing import Optional, Literal
 from pathlib import Path
-import sys
+
 
 console = Console()
 
 
 def main(
     cloud: Optional[str] = typer.Option(None, "--cloud", "-c", help="Cloud storage profile name. If not provided, uses default from config."),
-    path: Optional[str] = typer.Option(None, "--path", "-p", help="Path to the local repository. Defaults to current working directory."),
+    repo: Optional[str] = typer.Option(None, "--repo", "-r", help="Path to the local repository. Defaults to current working directory."),
     message: Optional[str] = typer.Option(None, "--message", "-m", help="Commit message for local changes."),
     on_conflict: Literal["ask", "pushLocalMerge", "overwriteLocal", "InspectRepos", "RemoveLocalRclone"] = typer.Option("ask", "--on-conflict", "-oc", help="Action to take on merge conflict. Default is 'ask'."),
     pwd: Optional[str] = typer.Option(None, "--password", help="Password for encryption/decryption of the remote repository."),
 ):
     if cloud is None:
         try:
+            from machineconfig.utils.io import read_ini
+
             cloud_resolved = read_ini(DEFAULTS_PATH)["general"]["rclone_config_name"]
             console.print(Panel(f"⚠️  Using default cloud: `{cloud_resolved}` from {DEFAULTS_PATH}", title="Default Cloud", border_style="yellow"))
         except FileNotFoundError:
@@ -35,7 +35,7 @@ def main(
             return ""
     else:
         cloud_resolved = cloud
-    repo_local_root = PathExtended.cwd() if path is None else PathExtended(path).expanduser().absolute()
+    repo_local_root = PathExtended.cwd() if repo is None else PathExtended(repo).expanduser().absolute()
     repo_local_obj = git.Repo(repo_local_root, search_parent_directories=True)
     repo_local_root = PathExtended(repo_local_obj.working_dir)  # cwd might have been in a sub directory of repo_root, so its better to redefine it.
     PathExtended(CONFIG_PATH).joinpath("remote").mkdir(parents=True, exist_ok=True)
@@ -139,15 +139,17 @@ git commit -am "finished merging"
 
         console.print(Panel("🔄 RESOLVE MERGE CONFLICT\nChoose an option to resolve the conflict:", title_align="left", border_style="blue"))
 
-        print(f"• 1️⃣  {option1:75} 👉 {shell_file_1}")
-        print(f"• 2️⃣  {option2:75} 👉 {shell_file_2}")
-        print(f"• 3️⃣  {option3:75} 👉 {shell_file_3}")
-        print(f"• 4️⃣  {option4:75} 👉 {shell_file_4}")
+        print(f"• {option1:75} 👉 {shell_file_1}")
+        print(f"• {option2:75} 👉 {shell_file_2}")
+        print(f"• {option3:75} 👉 {shell_file_3}")
+        print(f"• {option4:75} 👉 {shell_file_4}")
+        print("\n\n")
 
         program_content = None
         match on_conflict:
             case "ask":
-                choice = choose_from_options(multi=False, msg="Choose one option", options=[option1, option2, option3, option4], fzf=False)
+                import questionary
+                choice = questionary.select("Choose one option:", choices=[option1, option2, option3, option4]).ask()
                 if choice == option1:
                     program_content = shell_file_1.read_text(encoding="utf-8")
                 elif choice == option2:
@@ -168,24 +170,7 @@ git commit -am "finished merging"
                 program_content = program_4
             case _:
                 raise ValueError(f"Unknown action: {on_conflict}")
-        # PROGRAM_PATH.write_text(program_content, encoding="utf-8")
-        subprocess.run(program_content, shell=True, check=True)
-
+        from machineconfig.utils.code import run_shell_script
+        run_shell_script(script=program_content)
     return program_content
 
-
-def args_parser():
-    # Check if no arguments provided (excluding the script name)
-    if len(sys.argv) == 1:
-        app = typer.Typer(add_completion=False, help="Sync a local git repository with a remote encrypted cloud copy.")
-        app.command()(main)
-        app(["--help"])
-        return
-
-    app = typer.Typer(add_completion=False, no_args_is_help=True, help="Sync a local git repository with a remote encrypted cloud copy.")
-    app.command()(main)
-    app()
-
-
-if __name__ == "__main__":
-    args_parser()

machineconfig/scripts/python/devops.py

@@ -1,17 +1,15 @@
 """devops with emojis"""
 
 import typer
-from typing import Literal, Annotated, Optional, get_args
+from typing import Literal, Annotated, Optional
 
-import machineconfig.scripts.python.share_terminal as share_terminal
 import machineconfig.scripts.python.repos as repos
-from machineconfig.jobs.installer.package_groups import PACKAGE_GROUPS
-
+import machineconfig.scripts.python.share_terminal as share_terminal
 
 app = typer.Typer(help="🛠️ DevOps operations", no_args_is_help=True)
 @app.command(no_args_is_help=True)
 def install(    which: Optional[str] = typer.Option(None, "--which", "-w", help="Comma-separated list of program names to install."),
-    group: Optional[PACKAGE_GROUPS] = typer.Option(None, "--group", "-g", help=f"Group name (one of {list(get_args(PACKAGE_GROUPS))})"),
+    group: Optional[str] = typer.Option(None, "--group", "-g", help="Groups names. A group is bundle of apps. See available groups when running interactively."),
     interactive: bool = typer.Option(False, "--interactive", "-ia", help="Interactive selection of programs to install."),
 ) -> None:
     """📦 Install essential packages"""
@@ -30,7 +28,6 @@ app.add_typer(nw_apps, name="network")
 self_app = typer.Typer(help="🔄 SELF operations subcommands", no_args_is_help=True)
 app.add_typer(self_app, name="self")
 
-
 @self_app.command()
 def update():
     """🔄 UPDATE essential repos"""
@@ -53,12 +50,12 @@ def clone():
     from machineconfig.utils.code import run_shell_script
     from machineconfig.profile.shell import create_default_shell_profile
     if platform.system() == "Windows":
-        from machineconfig.setup_windows import REPOS
+        from machineconfig.setup_windows import MACHINECONFIG
         create_default_shell_profile(method="copy")
     else:
-        from machineconfig.setup_linux import REPOS
+        from machineconfig.setup_linux import MACHINECONFIG
         create_default_shell_profile(method="reference")
-    run_shell_script(REPOS.read_text(encoding="utf-8"))
+    run_shell_script(MACHINECONFIG.read_text(encoding="utf-8"))
 
 
 
@@ -125,7 +122,7 @@ def setup():
     else:
         raise NotImplementedError(f"Platform {platform.system()} is not supported.")
     from machineconfig.utils.code import run_shell_script
-    run_shell_script(program=program)
+    run_shell_script(script=program)
 
 
 @app_data.command()

machineconfig/scripts/python/helpers/repo_sync_helpers.py

@@ -82,5 +82,5 @@ def check_dotfiles_version_is_beyond(commit_dtm: str, update: bool) -> bool:
         console.print(Panel(f"🔄 UPDATE REQUIRED | Updating dotfiles because {dtm} < {datetime.fromisoformat(commit_dtm)}", border_style="bold blue", expand=False))
         from machineconfig.scripts.python.cloud_repo_sync import main
 
-        main(cloud=None, path=dotfiles_path)
+        main(cloud=None, repo=dotfiles_path)
     return res

machineconfig/scripts/python/helpers_fire/fire_agents_help_launch.py

@@ -2,13 +2,12 @@
 import random
 import shlex
 from pathlib import Path
-from machineconfig.scripts.python.helpers_fire.fire_agents_helper_types import AGENTS, AGENT_NAME_FORMATTER
+from machineconfig.scripts.python.helpers_fire.fire_agents_helper_types import AGENTS, AGENT_NAME_FORMATTER, MATCHINE, PROVIDER, MODEL
 
 
-def get_gemini_api_keys() -> list[str]:
+def get_api_keys(provider: PROVIDER) -> list[str]:
     from machineconfig.utils.io import read_ini
-
-    config = read_ini(Path.home().joinpath("dotfiles/creds/llm/gemini/api_keys.ini"))
+    config = read_ini(Path.home().joinpath(f"dotfiles/creds/llm/{provider}/api_keys.ini"))
     res: list[str] = []
     for a_section_name in list(config.sections()):
         a_section = config[a_section_name]
@@ -16,11 +15,12 @@ def get_gemini_api_keys() -> list[str]:
             api_key = a_section["api_key"].strip()
             if api_key:
                 res.append(api_key)
-    print(f"Found {len(res)} Gemini API keys configured.")
+    print(f"Found {len(res)} {provider} API keys configured.")
     return res
 
 
-def prep_agent_launch(agents_dir: Path, prompts_material: list[str], prompt_prefix: str, keep_material_in_separate_file: bool, agent: AGENTS, *, job_name: str) -> None:
+def prep_agent_launch(repo_root: Path, agents_dir: Path, prompts_material: list[str], prompt_prefix: str, keep_material_in_separate_file: bool,
+                      machine: MATCHINE, model: MODEL, 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)
@@ -32,21 +32,22 @@ def prep_agent_launch(agents_dir: Path, prompts_material: list[str], prompt_pref
         if keep_material_in_separate_file:
             prompt_material_path = prompt_root / f"agent_{idx}_material.txt"
             prompt_material_path.write_text(a_prompt_material, encoding="utf-8")
-            prompt_path.write_text(prompt_prefix + f"""\nPlease only look @ {prompt_material_path}. You don't need to do any other work beside the content of this material file.""", encoding="utf-8")
+            prompt_path.write_text(prompt_prefix + f"""\nPlease only look @ {prompt_material_path.relative_to(repo_root)}. You don't need to do any other work beside the content of this material file.""", encoding="utf-8")
         else:
             prompt_material_path = prompt_path
             prompt_path.write_text(prompt_prefix + """\nPlease only look @ the following:\n""" + a_prompt_material, encoding="utf-8")
 
         agent_cmd_launch_path = prompt_root / AGENT_NAME_FORMATTER.format(idx=idx)  # e.g., agent_0_cmd.sh
         random_sleep_time = random.uniform(0, 5)
-        cmd_prefix = f"""
-#!/usr/bin/env bash
-
-sleep 5
-timeout 3 copilot --banner
+        cmd_prefix = f"""#!/usr/bin/env bash
 
-# AGENT-{idx}-LAUNCH-SCRIPT
-# Auto-generated by fire_agents.py
+echo "Using machine: {machine}, model: {model}, provider: {provider}, and agent: {agent}"
+echo "{job_name}-{idx} CMD {agent_cmd_launch_path}"
+echo "{job_name}-{idx} PROMPT {prompt_path}"
+echo "{job_name}-{idx} CONTEXT {prompt_material_path}"
+echo "Starting agent {agent} in 5 seconds... Press Ctrl+C to cancel."
+# sleep 5
+# timeout 3 copilot --banner
 
 export FIRE_AGENTS_AGENT_NAME="{agent}"
 export FIRE_AGENTS_JOB_NAME="{job_name}"
@@ -56,56 +57,37 @@ export FIRE_AGENTS_AGENT_LAUNCHER="{agent_cmd_launch_path}"
 
 echo "Sleeping for {random_sleep_time:.2f} seconds to stagger agent startups..."
 sleep {random_sleep_time:.2f}
-echo "Launching agent {agent} with prompt from {prompt_path}"
-echo "Launching agent {agent} with command from {agent_cmd_launch_path}"
 echo "--------START OF AGENT OUTPUT--------"
 sleep 0.1
 
 """
         match agent:
             case "gemini":
-                model = "gemini-2.5-pro"
-                # model = "gemini-2.5-flash-lite"
-                # model = None  # auto-select
-                # if model is None:
-                #     model_arg = ""
-                # else:
-                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))
-                api_keys = get_gemini_api_keys()
-                api_key = api_keys[idx % len(api_keys)] if api_keys else ""
-                # Export the environment variable so it's available to subshells
-                cmd = f"""
-
-export GEMINI_API_KEY={shlex.quote(api_key)}
-echo "Using Gemini API key $GEMINI_API_KEY"
-
-gemini {model_arg} --yolo --prompt {safe_path}
-"""
+                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.fire_gemini import fire_gemini
+                cmd = fire_gemini(api_key=api_key, prompt_path=prompt_path, machine=machine)
             case "cursor-agent":
-                # As originally implemented
-                cmd = f"""
-
-cursor-agent --print --output-format text {prompt_path}
-
-"""
+                from machineconfig.scripts.python.helpers_fire.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":
-                cmd = f"""
-crush run {prompt_path}
-"""
+                from machineconfig.scripts.python.helpers_fire.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)
             case "q":
-                cmd = f"""
-q chat --no-interactive --trust-all-tools {prompt_path}
-"""
+                from machineconfig.scripts.python.helpers_fire.fire_q import fire_q
+                cmd = fire_q(api_key="", prompt_path=prompt_path, machine=machine)
             case _:
                 raise ValueError(f"Unsupported agent type: {agent}")
+
         cmd_postfix = """
 sleep 0.1
 echo "---------END OF AGENT OUTPUT---------"
 """
         agent_cmd_launch_path.write_text(cmd_prefix + cmd + cmd_postfix, encoding="utf-8")
-
     return None
 
 

machineconfig/scripts/python/helpers_fire/fire_agents_helper_types.py

@@ -1,12 +1,30 @@
 
-from typing import Literal, TypeAlias
+from typing import Literal, TypeAlias, TypedDict
 
 
-AGENTS: TypeAlias = Literal[
-    "cursor-agent", "gemini", "crush", "q"
-    # warp terminal
-]
-AGENT_NAME_FORMATTER = "agent_{idx}_cmd.sh"  # e.g., agent_0_cmd.sh
+AGENTS: TypeAlias = Literal["cursor-agent", "gemini", "crush", "q", "opencode"]
+MATCHINE: 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
+    agent: AGENTS
+    machine: MATCHINE    
 
+
+AGENT_NAME_FORMATTER = "agent_{idx}_cmd.sh"  # e.g., agent_0_cmd.sh
 SEARCH_STRATEGIES: TypeAlias = Literal["file_path", "keyword_search", "filename_pattern"]
 

machineconfig/scripts/python/helpers_fire/fire_crush.json

@@ -0,0 +1,14 @@
+{
+    "models": {
+        "large": {
+            "model": "{model}",
+            "provider": "{provider}",
+            "max_tokens": 100000
+        }
+    },
+    "providers": {
+        "openrouter": {
+            "api_key": "{api_key}"
+        }
+    }
+}

machineconfig/scripts/python/helpers_fire/fire_crush.py

@@ -0,0 +1,37 @@
+
+from pathlib import Path
+# import shlex
+from typing import Optional
+from machineconfig.scripts.python.helpers_fire.fire_agents_helper_types import MATCHINE, PROVIDER, MODEL
+
+
+def fire_crush(api_key: Optional[str], model: MODEL, provider: PROVIDER, machine: MATCHINE, prompt_path: Path, repo_root: Path) -> str:
+    match 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."
+            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]
+            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 \
+  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)}'"
+
+"""
+    return cmd