machineconfig 6.82__py3-none-any.whl → 7.98__py3-none-any.whl

machineconfig/profile/create_shell_profile.py

@@ -1,23 +1,16 @@
 """shell"""
 
-from machineconfig.utils.path_extended import PathExtended
-from machineconfig.utils.source_of_truth import CONFIG_ROOT
 from pathlib import Path
-import platform
-import os
-import subprocess
-from rich.console import Console
-from rich.panel import Panel
 
 
-system = platform.system()
-sep = ";" if system == "Windows" else ":"  # PATH separator, this is special for PATH object, not to be confused with PathExtended.sep (normal paths), usually / or \
-PATH = os.environ["PATH"].split(sep)
-console = Console()
-BOX_WIDTH = 100  # Define BOX_WIDTH or get it from a config
-
 
 def get_shell_profile_path() -> Path:
+    import platform
+    import subprocess
+    from rich.console import Console
+    from rich.panel import Panel
+    system = platform.system()
+    console = Console()
     if system == "Windows":
         result = subprocess.run(["pwsh", "-Command", "$PROFILE"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, check=False)
         if result.returncode == 0 and result.stdout.strip():
@@ -37,8 +30,34 @@ def get_shell_profile_path() -> Path:
     return profile_path
 
 
+def get_nu_shell_profile_path() -> Path:
+    import platform
+    from rich.console import Console
+    from rich.panel import Panel
+    system = platform.system()
+    console = Console()
+    if system == "Windows":
+        profile_path = Path.home().joinpath(r"AppData\Roaming\nushell")
+    elif system == "Linux":
+        profile_path = Path.home().joinpath(".config/nushell")
+    elif system == "Darwin":
+        profile_path = Path.home().joinpath("Library/Application Support/nushell")
+    else:
+        raise ValueError(f"""Not implemented for this system {system}""")
+    console.print(Panel(f"""🐚 NU SHELL PROFILE | Working with path: `{profile_path}`""", title="[bold cyan]Nu Shell Profile[/bold cyan]", border_style="cyan"))
+    return profile_path
+
+
 def create_default_shell_profile() -> None:
     shell_profile_path = get_shell_profile_path()
+    import platform
+    import subprocess
+    from rich.console import Console
+    from rich.panel import Panel
+    from machineconfig.utils.source_of_truth import CONFIG_ROOT
+    from machineconfig.utils.path_extended import PathExtended
+    system = platform.system()
+    console = Console()
     if not shell_profile_path.exists():
         console.print(Panel(f"""🆕 PROFILE | Profile does not exist at `{shell_profile_path}`. Creating a new one.""", title="[bold blue]Profile[/bold blue]", border_style="blue"))
         shell_profile_path.parent.mkdir(parents=True, exist_ok=True)
@@ -47,13 +66,17 @@ def create_default_shell_profile() -> None:
     from machineconfig.profile.create_helper import copy_assets_to_machine
     copy_assets_to_machine("settings")  # init.ps1 or init.sh live here
     copy_assets_to_machine("scripts")  # init scripts are going to reference those scripts.
+    shell_name = ""
     if system == "Windows":
+        shell_name = "pwsh"
         init_script = PathExtended(CONFIG_ROOT).joinpath("settings/shells/pwsh/init.ps1")
         source_line = f""". {str(init_script.collapseuser(placeholder="$HOME"))}"""
     elif system == "Linux":
+        shell_name = "bash"
         init_script = PathExtended(CONFIG_ROOT).joinpath("settings/shells/bash/init.sh")
         source_line = f"""source {str(init_script.collapseuser(placeholder="$HOME"))}"""
     elif system == "Darwin":
+        shell_name = "zsh"
         init_script = PathExtended(CONFIG_ROOT).joinpath("settings/shells/zsh/init.sh")
         source_line = f"""source {str(init_script.collapseuser(placeholder="$HOME"))}"""
     else:
@@ -61,17 +84,24 @@ def create_default_shell_profile() -> None:
 
     was_shell_updated = False
     if source_line in shell_profile:
-        console.print(Panel("🔄 PROFILE | Skipping init script sourcing - already present in profile", title="[bold blue]Profile[/bold blue]", border_style="blue"))        
+        console.print(Panel("🔄 PROFILE | Skipping init script sourcing - already present in profile", title="[bold blue]Profile[/bold blue]", border_style="blue"))
     else:
         console.print(Panel("📝 PROFILE | Adding init script sourcing to profile", title="[bold blue]Profile[/bold blue]", border_style="blue"))
         shell_profile += "\n" + source_line + "\n"
-        if system == "Linux":
+        if shell_name == "bash":
             result = subprocess.run(["cat", "/proc/version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, check=False)
             if result.returncode == 0 and result.stdout:
                 version_info = result.stdout.lower()
-                if "microsoft" in version_info or "wsl" in version_info:
+                is_wsl = "microsoft" in version_info or "wsl" in version_info
+                if is_wsl:
                     shell_profile += "\ncd $HOME"
                     console.print("📌 WSL detected - adding 'cd $HOME' to profile to avoid Windows filesystem")
+                    # Sync shell history between Windows and WSL
+                    # https://www.hanselman.com/blog/sharing-powershell-history-between-windows-and-wsl
+                    shell_profile += """
+# Sync shell history between Windows and WSL
+export PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND$'\\n'}history -a; history -c; history -r"
+"""
         was_shell_updated = True
     if was_shell_updated:
         shell_profile_path.parent.mkdir(parents=True, exist_ok=True)
@@ -79,117 +109,38 @@ def create_default_shell_profile() -> None:
         console.print(Panel("✅ Profile updated successfully", title="[bold blue]Profile[/bold blue]", border_style="blue"))
 
 
-# def append_temporarily(dirs: list[str], kind: Literal["append", "prefix", "replace"]) -> str:
-#     dirs_ = []
-#     for path in dirs:
-#         path_rel = PathExtended(path).collapseuser(strict=False)
-#         if path_rel.as_posix() in PATH or str(path_rel) in PATH or str(path_rel.expanduser()) in PATH or path_rel.expanduser().as_posix() in PATH:
-#             print(f"Path passed `{path}` is already in PATH, skipping the appending.")
-#         else:
-#             dirs_.append(path_rel.as_posix() if system == "Linux" else str(path_rel))
-#     dirs = dirs_
-#     if len(dirs) == 0:
-#         return ""
-
-#     if system == "Windows":
-#         """Source: https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_environment_variables?view=powershell-7.2"""
-#         if kind == "append":
-#             command = rf'$env:Path += ";{sep.join(dirs)}"'  # Append to the Path variable in the current window:
-#         elif kind == "prefix":
-#             command = rf'$env:Path = "{sep.join(dirs)};" + $env:Path'  # Prefix the Path variable in the current window:
-#         elif kind == "replace":
-#             command = rf'$env:Path = "{sep.join(dirs)}"'  # Replace the Path variable in the current window (use with caution!):
-#         else:
-#             raise KeyError
-#         return command  # if run is False else tm.run(command, shell="powershell")
-#     elif system in ["Linux", "Darwin"]:
-#         result = f'export PATH="{sep.join(dirs)}:$PATH"'
-#     else:
-#         raise ValueError
-#     return result
-
-
-# def main_add_sources_to_shell_profile(profile_path: Optional[str], choice: Optional[str]) -> None:
-#     sources: list[str] = read_toml(LIBRARY_ROOT.joinpath("profile/sources.toml"))[system.lower()]["files"]
-#     console.print(Panel("🔄 Adding sources to shell profile", title="[bold blue]Sources[/bold blue]", border_style="blue"))
-
-#     if choice is None:
-#         choice_obj = choose_from_options(msg="Which patch to add?", options=sources + ["all", "none(EXIT)"], default="none(EXIT)", multi=True)
-#         if isinstance(choice_obj, str):
-#             if choice_obj == "all":
-#                 choice = choice_obj
-#             elif choice_obj == "none(EXIT)":
-#                 return
-#             else:
-#                 sources = [choice_obj]
-#         else:  # isinstance(choice_obj, list):
-#             sources = choice_obj
-#     elif choice == "none(EXIT)":
-#         return
-
-#     if isinstance(profile_path, str):
-#         profile_path_obj = PathExtended(profile_path)
-#     else:
-#         profile_path_obj = get_shell_profile_path()
-#     profile = profile_path_obj.read_text(encoding="utf-8")
-
-#     for a_file in sources:
-#         tmp = a_file.replace("REPO_ROOT", REPO_ROOT.as_posix()).replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix())
-#         file = PathExtended(tmp).collapseuser()  # this makes the shell profile interuseable across machines.
-#         file = file.as_posix() if system == "Linux" else str(file)
-#         if file not in profile:
-#             if system == "Windows":
-#                 profile += f"\n. {file}"
-#                 console.print(f"➕ Added PowerShell source: {file}")
-#             elif system == "Linux":
-#                 profile += f"\nsource {file}"
-#                 console.print(f"➕ Added Bash source: {file}")
-#             else:
-#                 raise ValueError(f"Not implemented for this system {system}")
-#         else:
-#             console.print(f"⏭️  Source already present: {file}")
-
-#     profile_path_obj.write_text(profile, encoding="utf-8")
-#     console.print(Panel("✅ Shell profile updated with sources", title="[bold blue]Sources[/bold blue]", border_style="blue"))
-
-
-# def main_add_patches_to_shell_profile(profile_path: Optional[str], choice: Optional[str]) -> None:
-#     patches: list[str] = [item.as_posix() for item in PathExtended(LIBRARY_ROOT).joinpath(f"profile/patches/{system.lower()}").search()]
-
-#     console.print(Panel("🩹 Adding patches to shell profile", title="[bold blue]Patches[/bold blue]", border_style="blue"))
-
-#     if choice is None:
-#         choice_chosen = choose_from_options(msg="Which patch to add?", options=list(patches) + ["all", "none(EXIT)"], default="none(EXIT)", multi=False)
-#         assert isinstance(choice_chosen, str), f"Choice must be a string or a list of strings, not {type(choice)}"
-#         choice = choice_chosen
-#     if choice == "none(EXIT)":
-#         return None
-#     elif str(choice) == "all":
-#         console.print("📌 Adding all patches to profile")
-#     else:
-#         patches = [choice]
-#         console.print(f"📌 Adding selected patch: {choice}")
-
-#     profile_path_obj = PathExtended(profile_path) if isinstance(profile_path, str) else get_shell_profile_path()
-#     profile = profile_path_obj.read_text(encoding="utf-8")
-
-#     for patch_path in patches:
-#         patch_path_obj = PathExtended(patch_path)
-#         patch = patch_path_obj.read_text(encoding="utf-8")
-#         if patch in profile:
-#             console.print(f"⏭️  Patch already present: {patch_path_obj.name}")
-#         else:
-#             profile += "\n" + patch
-#             console.print(f"➕ Added patch: {patch_path_obj.name}")
-
-#     if system == "Linux":
-#         res = Terminal().run("cat /proc/version").op
-#         if "microsoft" in res.lower() or "wsl" in res.lower():
-#             profile += "\ncd ~"  # this is to make sure that the current dir is not in the windows file system, which is terribly slow and its a bad idea to be there anyway.
-#             console.print("📌 WSL detected - adding 'cd ~' to profile to avoid Windows filesystem")
-
-#     profile_path_obj.write_text(profile, encoding="utf-8")
-#     console.print(Panel("✅ Shell profile updated with patches", title="[bold blue]Patches[/bold blue]", border_style="blue"))
+def create_nu_shell_profile() -> None:
+    from rich.console import Console
+    from rich.panel import Panel
+    from machineconfig.utils.source_of_truth import CONFIG_ROOT
+    from machineconfig.utils.path_extended import PathExtended
+    console = Console()
+    nu_profile_path = get_nu_shell_profile_path()
+    config_dir = nu_profile_path
+    config_file = config_dir.joinpath("config.nu")
+    if not config_dir.exists():
+        console.print(Panel(f"""🆕 NU SHELL CONFIG | Config directory does not exist at `{config_dir}`. Creating a new one.""", title="[bold cyan]Nu Shell Config[/bold cyan]", border_style="cyan"))
+        config_dir.mkdir(parents=True, exist_ok=True)
+    if not config_file.exists():
+        console.print(Panel(f"""🆕 NU SHELL CONFIG | config.nu file does not exist at `{config_file}`. Creating a new one.""", title="[bold cyan]Nu Shell Config[/bold cyan]", border_style="cyan"))
+        config_file.write_text("", encoding="utf-8")
+    config_content = config_file.read_text(encoding="utf-8")
+    from machineconfig.profile.create_helper import copy_assets_to_machine
+    copy_assets_to_machine("settings")
+    copy_assets_to_machine("scripts")
+    init_script = PathExtended(CONFIG_ROOT).joinpath("settings/shells/nushell/init.nu")
+    source_line = f"""use {str(init_script)}"""
+    was_config_updated = False
+    if source_line in config_content:
+        console.print(Panel("🔄 NU SHELL CONFIG | Skipping init script sourcing - already present in config.nu", title="[bold cyan]Nu Shell Config[/bold cyan]", border_style="cyan"))
+    else:
+        console.print(Panel("📝 NU SHELL CONFIG | Adding init script sourcing to config.nu", title="[bold cyan]Nu Shell Config[/bold cyan]", border_style="cyan"))
+        config_content += "\n" + source_line + "\n"
+        was_config_updated = True
+    if was_config_updated:
+        config_dir.mkdir(parents=True, exist_ok=True)
+        config_file.write_text(config_content, encoding="utf-8")
+        console.print(Panel("✅ Nu shell config updated successfully", title="[bold cyan]Nu Shell Config[/bold cyan]", border_style="cyan"))
 
 
 if __name__ == "__main__":

machineconfig/profile/mapper.toml

@@ -33,9 +33,6 @@ config2 = {this = '~/.cli-m365-all-connections.json', to_this = '~/dotfiles/cred
 config3 = {this = '~/.cli-m365-connection.json',      to_this = '~/dotfiles/creds/tokens/.cli-m365-connection.json'}
 # config2 = {this = '~/.cli-m365-tokens.json',        to_this = '~/dotfiles/creds/tokens/.cli-m365-tokens.json'}
 
-# [bash_linux]
-# bashrc = {this = '~/.inputrc', to_this = '~/dotfiles/shells/bash/.inputrc'}
-
 [remmina]
 data = {this = '~/.var/app/org.remmina.Remmina/data/remmina', to_this = '~/dotfiles/creds/RDP/remmina/data/remmina'}
 
@@ -97,14 +94,23 @@ config_again = {this = '~/.config/procs/config.toml', to_this = 'CONFIG_ROOT/set
 config = {this = '~/.config/rofi/config.rasi', to_this = 'CONFIG_ROOT/settings/rofi/config.rasi'}
 
 [yazi_windows]
-yazi = {this = '~/AppData/Roaming/yazi/config/yazi.toml', to_this = 'CONFIG_ROOT/settings/yazi/yazi.toml'}
-keymap = {this = '~/AppData/Roaming/yazi/config/keymap.toml', to_this = 'CONFIG_ROOT/settings/yazi/keymap.toml'}
+yazi = {this = '~/AppData/Roaming/yazi/config/yazi.toml', to_this = 'CONFIG_ROOT/settings/yazi/yazi_windows.toml'}
+keymap = {this = '~/AppData/Roaming/yazi/config/keymap.toml', to_this = 'CONFIG_ROOT/settings/yazi/keymap_windows.toml'}
 theme = {this = '~/AppData/Roaming/yazi/config/theme.toml', to_this = 'CONFIG_ROOT/settings/yazi/theme.toml'}
+init = {this = '~/AppData/Roaming/yazi/config/init.lua', to_this = 'CONFIG_ROOT/settings/yazi/init.lua'}
+
+[television_linux]
+cable = {this = '~/.config/television/cable', to_this = 'CONFIG_ROOT/settings/television/cable_unix', contents = true}
+
+[television_windows]
+cable = {this = '~/AppData/Local/television/config/cable', to_this = 'CONFIG_ROOT/settings/television/cable_windows', contents = true}
+
 
 [yazi_linux]
-yazi = {this = '~/.config/yazi/yazi.toml', to_this = 'CONFIG_ROOT/settings/yazi/yazi.toml'}
-keymap = {this = '~/.config/yazi/keymap.toml', to_this = 'CONFIG_ROOT/settings/yazi/keymap.toml'}
+yazi = {this = '~/.config/yazi/yazi.toml', to_this = 'CONFIG_ROOT/settings/yazi/yazi_linux.toml'}
+keymap = {this = '~/.config/yazi/keymap.toml', to_this = 'CONFIG_ROOT/settings/yazi/keymap_linux.toml'}
 theme = {this = '~/.config/yazi/theme.toml', to_this = 'CONFIG_ROOT/settings/yazi/theme.toml'}
+init = {this = '~/.config/yazi/init.lua', to_this = 'CONFIG_ROOT/settings/yazi/init.lua'}
 
 [lf_windows]
 config = {this = '~/AppData/Local/lf/lfrc', to_this = 'CONFIG_ROOT/settings/lf/windows/lfrc'}
@@ -162,7 +168,7 @@ config = {this = '~/.config/pudb/pudb.cfg', to_this = 'CONFIG_ROOT/settings/pudb
 # AllUsersCurrentHost = {this = 'C:\Windows\System32\WindowsPowerShell\v1.0\Microsoft.PowerShell_profile.ps1', to_this = '~/dotfiles/shells/powershell/AllUsersCurrentHost/Microsoft.PowerShell_profile.ps1'}
 # AllUsersAllHosts = {this = 'C:\Windows\System32\WindowsPowerShell\v1.0\profile.ps1', to_this = '~/dotfiles/shells/windows_powershell/AllUsersAllHosts/profile.ps1'}
 
-[pwsh_windows]
+# [pwsh_windows]
 # CurrentUserCurrentHost = {this = '~/Documents/PowerShell/Microsoft.PowerShell_profile.ps1', to_this = 'CONFIG_ROOT/settings/shells/pwsh/init.ps1'}
 # CurrentUserAllHosts = {this = '~/Documents/PowerShell/profile.ps1', to_this = 'CONFIG_ROOT/settings/shells/pwsh/profile.ps1'}
 # AllUsersCurrentHost = {this = 'C:\Program Files\PowerShell\7\Microsoft.PowerShell_profile.ps1', to_this = 'CONFIG_ROOT/settings/shells/pwsh/init.ps1'}
@@ -225,6 +231,7 @@ config = { this = '~/AppData/Roaming/helix/config.toml', to_this = 'CONFIG_ROOT/
 [helix_linux]
 languages = { this = '~/.config/helix/languages.toml', to_this = 'CONFIG_ROOT/settings/helix/languages.toml' }
 config = { this = '~/.config/helix/config.toml', to_this = 'CONFIG_ROOT/settings/helix/config.toml' }
+yazi_picker = { this = '~/.config/helix/yazi-picker.sh', to_this = 'CONFIG_ROOT/settings/helix/yazi-picker.sh' }
 
 [lvim_windows]
 config = { this = '~/AppData/Local/lvim/config.lua', to_this = 'CONFIG_ROOT/settings/lvim/windows/config.lua' }

machineconfig/scripts/__init__.py

@@ -1,4 +0,0 @@
-version = "0.5"
-release_notes = """
-created toml file for symlinks
-"""

machineconfig/scripts/linux/wrap_mcfg

@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+
+
+wrap_in_shell_script() {
+  # set -euo pipefail
+  # ANSI color/style codes
+  # BOLD="\033[1m"
+  # RESET="\033[0m"
+  # GREEN="\033[32m"
+  # YELLOW="\033[33m"
+  # BLUE="\033[34m"
+  # RED="\033[31m"
+
+  local command="$1"
+  shift  
+  local RANDOM_NAME=$(LC_ALL=C tr -dc 'A-Za-z0-9' </dev/urandom | head -c 12)
+  local OP_DIR="$HOME/tmp_results/tmp_scripts/machineconfig"
+  local OP_PROGRAM_PATH="$OP_DIR/${RANDOM_NAME}.sh"
+  export OP_PROGRAM_PATH
+  # local timestamp=$(date -u +"%Y-%m-%d %H:%M:%SZ")
+  # printf "%b\n" "${BOLD}${BLUE}🛠️  machineconfig — running ${command}${RESET}"
+  # printf "%b\n" "${BLUE}Timestamp:${RESET} ${timestamp}"
+  # printf "%b\n" "${BLUE}Op program path:${RESET} ${OP_PROGRAM_PATH}"
+  # Forward arguments to the command
+  "$command" "$@"
+  if [[ -f "$OP_PROGRAM_PATH" ]]; then
+    printf "%b\n" "🚀 Taking over from python script @ ${OP_PROGRAM_PATH}${RESET}"
+    bat --style=full --theme=OneHalfDark --paging=never "$OP_PROGRAM_PATH"
+    # printf "%b\n" "${GREEN}▶ Running...${RESET}"
+    . "$OP_PROGRAM_PATH"
+    status=$?
+    # if [[ $status -eq 0 ]]; then
+      # printf "%b\n" "${GREEN}✅ '${command}' execution completed.${RESET}"
+    # else
+      # printf "%b\n" "${YELLOW}⚠️  Program exited with status ${status}${RESET}"
+    # fi
+  else
+    echo " "
+    # printf "%b\n" "${GREEN}✅ '${command}' execution completed.${RESET}"
+  fi
+}
+
+if [[ $# -gt 0 ]]; then
+  wrap_in_shell_script "$@"
+fi
+

machineconfig/scripts/nu/wrap_mcfg.nu

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

machineconfig/scripts/python/agents.py

@@ -2,33 +2,32 @@
 
 """
 
-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,
+    context_path: Annotated[Optional[str], 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",
     agent_load: Annotated[int, typer.Option(..., "--agent-load", "-al", help="Number of tasks per prompt")] = 13,
     prompt: Annotated[Optional[str], typer.Option(..., "--prompt", "-P", help="Prompt prefix as string")] = None,
-    prompt_path: Annotated[Optional[Path], typer.Option(..., "--prompt-path", "-pp", help="Path to prompt file")] = None,
+    prompt_path: Annotated[Optional[str], typer.Option(..., "--prompt-path", "-pp", help="Path to prompt file")] = None,
     job_name: Annotated[str, typer.Option(..., "--job-name", "-j", help="Job name")] = "AI_Agents",
     separate: Annotated[bool, typer.Option(..., "--separate", "-S", help="Keep prompt material in separate file to the context.")] = True,
-    output_path: Annotated[Optional[Path], typer.Option(..., "--output-path", "-o", help="Path to write the layout.json file")] = None,
-    agents_dir: Annotated[Optional[Path], typer.Option(..., "--agents-dir", "-ad", help="Directory to store agent files. If not provided, will be constructed automatically.")] = None,
+    output_path: Annotated[Optional[str], typer.Option(..., "--output-path", "-o", help="Path to write the layout.json file")] = None,
+    agents_dir: Annotated[Optional[str], 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
-
+    from pathlib import Path
     # validate mutual exclusive
     prompt_options = [prompt, prompt_path]
     provided_prompt = [opt for opt in prompt_options if opt is not None]
@@ -39,12 +38,13 @@ def create(
     if repo_root is None:
         typer.echo("💥 Could not determine the repository root. Please run this script from within a git repository.")
         raise typer.Exit(1)
+        return
     typer.echo(f"Operating @ {repo_root}")
     
     if context_path is None:
-        context_path = repo_root / ".ai" / "todo"
-        
-    context_path_resolved = context_path.expanduser().resolve()
+        context_path_resolved = Path(repo_root) / ".ai" / "todo"
+    else: context_path_resolved = Path(context_path).expanduser().resolve()
+
     if not context_path_resolved.exists():
         raise typer.BadParameter(f"Path does not exist: {context_path_resolved}")
     
@@ -60,20 +60,21 @@ def create(
         raise typer.BadParameter(f"Path is neither file nor directory: {context_path_resolved}")
     
     if prompt_path is not None:
-        prompt_prefix = prompt_path.read_text(encoding="utf-8")
+        prompt_prefix = Path(prompt_path).read_text(encoding="utf-8")
     else:
         prompt_prefix = cast(str, prompt)
     agent_selected = agent
-    if agents_dir is None: agents_dir = repo_root / ".ai" / f"tmp_prompts/{job_name}_{randstr()}"
+    if agents_dir is None: agents_dir_obj = Path(repo_root) / ".ai" / f"tmp_prompts/{job_name}_{randstr()}"
     else:
         import shutil
-        if agents_dir.exists():
+        if Path(agents_dir).exists():
             shutil.rmtree(agents_dir)
-    prep_agent_launch(repo_root=repo_root, agents_dir=agents_dir, prompts_material=prompt_material_re_splitted,
+        agents_dir_obj = Path(agents_dir)
+    prep_agent_launch(repo_root=repo_root, agents_dir=agents_dir_obj, prompts_material=prompt_material_re_splitted,
                       keep_material_in_separate_file=separate,
                       prompt_prefix=prompt_prefix, machine=host, agent=agent_selected, model=model, provider=provider,
                       job_name=job_name)
-    layoutfile = get_agents_launch_layout(session_root=agents_dir)    
+    layoutfile = get_agents_launch_layout(session_root=agents_dir_obj)
     regenerate_py_code = f"""
 #!/usr/bin/env uv run --python 3.14 --with machineconfig
 agents create "{context_path_resolved}" \\
@@ -85,11 +86,11 @@ 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")
-    layout_output_path = output_path if output_path is not None else agents_dir / "layout.json"
+    (agents_dir_obj / "aa_agents_relaunch.sh").write_text(data=regenerate_py_code, encoding="utf-8")
+    layout_output_path = Path(output_path) if output_path is not None else agents_dir_obj / "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")
-    typer.echo(f"Created agents in {agents_dir}")
+    typer.echo(f"Created agents in {agents_dir_obj}")
     typer.echo(f"Ceated layout in {layout_output_path}")
 
 
@@ -99,6 +100,7 @@ def collect(
     separator: Annotated[str, typer.Option(..., help="Separator to use when concatenating material files")] = "\n",
 ) -> None:
     """Collect all material files from an agent directory and concatenate them."""
+    from pathlib import Path
     if not Path(agent_dir).exists() or not Path(agent_dir).is_dir():
         raise typer.BadParameter(f"Agent directory does not exist or is not a directory: {agent_dir}")
     
@@ -134,13 +136,15 @@ def collect(
     typer.echo(f"Concatenated material written to {output_path}")
 
 
-def template():
+def make_agents_command_template():
     from platform import system
-    import machineconfig.scripts.python.helpers_fire as module
+    import machineconfig.scripts.python.helpers_agents as module
+    from pathlib import Path
+
     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()}")
 
@@ -149,16 +153,29 @@ def template():
     if repo_root is None:
         typer.echo("💥 Could not determine the repository root. Please run this script from within a git repository.")
         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_path.read_text(encoding="utf-8"), encoding="utf-8")
-    typer.echo(f"Template bash script written to {save_path}")
+
+    save_path_root = repo_root / ".ai" / "agents"
+
+    save_path_root.mkdir(parents=True, exist_ok=True)
+    save_path_root.joinpath("template_fire_agents.sh").write_text(template_path.read_text(encoding="utf-8"), encoding="utf-8")
+    typer.echo(f"Template bash script written to {save_path_root}")
+
+    from machineconfig.scripts.python.ai.utils.generate_files import make_todo_files
+    make_todo_files(
+        pattern=".py", repo=str(repo_root), strategy="name", output_path=str(save_path_root / "files.md"), split_every=None, split_to=None
+    )
+
+    prompt_path = Path(module.__file__).parent / "templates/prompt.txt"
+    save_path_root.joinpath("prompt.txt").write_text(prompt_path.read_text(encoding="utf-8"), encoding="utf-8")
+    typer.echo(f"Prompt template written to {save_path_root}")
 
 
 def init_config():
     from machineconfig.scripts.python.ai.initai import add_ai_configs
+    from pathlib import Path
     add_ai_configs(repo_root=Path.cwd())
 
+
 def get_app():
     agents_app = typer.Typer(help="🤖 AI Agents management subcommands", no_args_is_help=True, add_help_option=False, add_completion=False)
     sep = "\n"
@@ -168,21 +185,19 @@ 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)
     agents_app.command("collect", no_args_is_help=True, help="[T] Collect all agent materials into a single file.")(collect)
     agents_app.command("T", no_args_is_help=True, help="Collect all agent materials into a single file.", hidden=True)(collect)
-    agents_app.command("make-template", no_args_is_help=False, help="[t] Create a template for fire agents")(template)
-    agents_app.command("t", no_args_is_help=False, help="Create a template for fire agents", hidden=True)(template)
+    agents_app.command("make-template", no_args_is_help=False, help="[t] Create a template for fire agents")(make_agents_command_template)
+    agents_app.command("t", no_args_is_help=False, help="Create a template for fire agents", hidden=True)(make_agents_command_template)
     agents_app.command("make-config", no_args_is_help=False, help="[g] Initialize AI configurations in the current repository")(init_config)
     agents_app.command("g", no_args_is_help=False, help="Initialize AI configurations in the current repository", hidden=True)(init_config)
-    from machineconfig.scripts.python.ai.generate_files import main
-    agents_app.command("make-todo", no_args_is_help=True, help="[d] Generate a markdown file listing all Python files in the repo")(main)
-    agents_app.command("d", no_args_is_help=True, help="Generate a markdown file listing all Python files in the repo", hidden=True)(main)
-    from machineconfig.scripts.python.ai.generate_files import create_symlink_command
+    from machineconfig.scripts.python.ai.utils.generate_files import make_todo_files
+    agents_app.command("make-todo", no_args_is_help=True, help="[d] Generate a markdown file listing all Python files in the repo")(make_todo_files)
+    agents_app.command("d", no_args_is_help=True, help="Generate a markdown file listing all Python files in the repo", hidden=True)(make_todo_files)
+    from machineconfig.scripts.python.ai.utils.generate_files import create_symlink_command
     agents_app.command(name="make-symlinks", no_args_is_help=True, help="[s] Create symlinks to the current repo in ~/code_copies/")(create_symlink_command)
     agents_app.command(name="s", no_args_is_help=True, help="Create symlinks to the current repo in ~/code_copies/", hidden=True)(create_symlink_command)
     return agents_app

machineconfig/scripts/python/ai/initai.py

@@ -7,7 +7,7 @@ from machineconfig.scripts.python.ai.solutions.copilot import github_copilot
 from machineconfig.scripts.python.ai.solutions.crush import crush
 from machineconfig.scripts.python.ai.solutions.cursor import cursors
 from machineconfig.scripts.python.ai.solutions.gemini import gemini
-from machineconfig.scripts.python.ai.vscode_tasks import add_lint_and_type_check_task
+from machineconfig.scripts.python.ai.utils.vscode_tasks import add_lint_and_type_check_task
 from machineconfig.utils.accessories import get_repo_root