machineconfig 5.67__tar.gz → 5.68__tar.gz

{machineconfig-5.67/src/machineconfig.egg-info → machineconfig-5.68}/PKG-INFO

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

{machineconfig-5.67 → machineconfig-5.68}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "5.67"
+version = "5.68"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -107,6 +107,7 @@ dev = [
     "pylint>=3.3.8",
     "pyrefly>=0.33.1",
     "pyright>=1.1.405",
+    "pytest>=8.4.2",
     "ruff>=0.13.1",
     "sqlalchemy>=2.0.43",
     "textual>=6.1.0",

{machineconfig-5.67 → machineconfig-5.68}/src/machineconfig/jobs/installer/installer_data.json

@@ -8,13 +8,13 @@
       "fileNamePattern": {
         "amd64": {
           "linux": "jq-linux-amd64",
-          "windows": null,
-          "macos": null
+          "windows": "jq-windows-amd64.exe",
+          "macos": "jq-macos-amd64"
         },
         "arm64": {
           "linux": "jq-linux-arm64",
           "windows": null,
-          "macos": null
+          "macos": "jq-macos-arm64"
         }
       }
     },

{machineconfig-5.67 → machineconfig-5.68}/src/machineconfig/scripts/python/agents.py

@@ -15,11 +15,11 @@ def create(
     provider: PROVIDER = typer.Option(default=..., help=f"Provider to use (for crush agent). One of {', '.join(get_args(PROVIDER)[:3])}"),
     context_path: Optional[Path] = typer.Option(None, help="Path to the context file/folder, defaults to .ai/todo/"),
     separator: str = typer.Option("\n", help="Separator for context"),
-    tasks_per_prompt: int = typer.Option(13, help="Number of tasks per prompt"),
+    agent_load: int = typer.Option(13, help="Number of tasks per prompt"),
     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"),
-    separate_prompt_from_context: bool = typer.Option(True, help="Keep prompt material in separate file to the context."),
+    separate: 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."),
 ):
@@ -49,7 +49,7 @@ def create(
         raise typer.BadParameter(f"Path does not exist: {context_path_resolved}")
     
     if context_path_resolved.is_file():
-        prompt_material_re_splitted = chunk_prompts(context_path_resolved, tasks_per_prompt=tasks_per_prompt, joiner=separator)
+        prompt_material_re_splitted = chunk_prompts(context_path_resolved, tasks_per_prompt=agent_load, joiner=separator)
     elif context_path_resolved.is_dir():
         files = [f for f in context_path_resolved.rglob("*") if f.is_file()]
         if not files:
@@ -64,14 +64,13 @@ def create(
     else:
         prompt_prefix = cast(str, prompt)
     agent_selected = agent
-    keep_material_in_separate_file_input = separate_prompt_from_context
     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(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,
+                      keep_material_in_separate_file=separate,
                       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)    
@@ -82,9 +81,9 @@ agents create "{context_path_resolved}" \\
     --agent "{agent_selected}" \\
     --machine "{machine}" \\
     --job-name "{job_name}" \\
-    --tasks-per-prompt {tasks_per_prompt} \\
+    --agent_load {agent_load} \\
     --separator "{separator}" \\
-    {"--separate-prompt-from-context" if keep_material_in_separate_file_input else ""}
+    {"--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"

{machineconfig-5.67 → machineconfig-5.68}/src/machineconfig/scripts/python/ai/generate_files.py

@@ -12,7 +12,7 @@ import shutil
 
 def get_python_files(repo_root: Path, exclude_init: bool = False) -> list[str]:
     """Get all Python files relative to repo root."""
-    excluded_parts = {".venv", "__pycache__", ".git", "build", "dist"}
+    excluded_parts = {".venv", "__pycache__", ".git", "build", "dist", ".ai"}
     excluded_patterns = {"*.egg-info"}
 
     # Get all .py files recursively
@@ -251,12 +251,12 @@ def main(
     pattern: Annotated[str, typer.Argument(help="Pattern or keyword to match files by")],
     repo: Annotated[str, typer.Argument(help="Repository path. Can be any directory within a git repository.")] = str(Path.cwd()),
     strategy: Annotated[Literal["name", "keywords"], typer.Option("-s", "--strategy", help="Strategy to filter files: 'name' for filename matching, 'keywords' for content matching")] = "name",
-    exclude_init: Annotated[bool, typer.Option("-e", "--exclude-init", help="Exclude __init__.py files from the checklist")] = False,
+    exclude_init: Annotated[bool, typer.Option("-x", "--exclude-init", help="Exclude __init__.py files from the checklist")] = True,
     include_line_count: Annotated[bool, typer.Option("-l", "--line-count", help="Include line count column in the output")] = False,
     output_path: Annotated[str, typer.Option("-o", "--output-path", help="Base path for output files relative to repo root")] = ".ai/todo/files",
     format_type: Annotated[Literal["csv", "md", "txt"], typer.Option("-f", "--format", help="Output format: csv, md (markdown), or txt")] = "md",
-    split_every: Annotated[Optional[int], typer.Option("--split-every", help="Split output into multiple files, each containing at most this many results")] = None,
-    split_to: Annotated[Optional[int], typer.Option("--split-to", help="Split output into exactly this many files")] = None,
+    split_every: Annotated[Optional[int], typer.Option("--split-every", "-e", help="Split output into multiple files, each containing at most this many results")] = None,
+    split_to: Annotated[Optional[int], typer.Option("--split-to", "-t", help="Split output into exactly this many files")] = None,
 ) -> None:
     """Generate checklist with Python and shell script files in the repository filtered by pattern."""
     repo_path = Path(repo).expanduser().absolute()

{machineconfig-5.67 → machineconfig-5.68}/src/machineconfig/scripts/python/ai/solutions/generic.py

@@ -48,6 +48,7 @@ def adjust_gitignore(repo_root: Path) -> None:
         "CLAUDE.md",
         "CRUSH.md",
         ".cursor",
+        ".clinerules"
         ".github/instructions",
         ".github/chatmodes",
         ".github/prompts",

{machineconfig-5.67 → machineconfig-5.68}/src/machineconfig/scripts/python/croshell.py

@@ -150,7 +150,7 @@ from pathlib import Path
             else:
                 console.print(Panel("❌ Could not determine the local machineconfig repo root. Please ensure the `REPO_ROOT` in `source_of_truth.py` is correctly set to the local path of the machineconfig repo, or do not use the `--local` flag.", title="Error", border_style="red"))
                 return
-        else: ve_line = "--with machineconfig[plot]>=5.65"
+        else: ve_line = "--with machineconfig[plot]>=5.67"
         fire_line = f"uv run --python 3.14 {ve_line} {interpreter} {interactivity} {profile} {str(pyfile)}"
 
     from machineconfig.utils.code import run_shell_script

{machineconfig-5.67 → machineconfig-5.68}/src/machineconfig/scripts/python/devops_helpers/cli_config.py

@@ -48,7 +48,7 @@ def path():
     from pathlib import Path
     path = Path(navigator.__file__).resolve().parent.joinpath("path_manager_tui.py")
     from machineconfig.utils.code import run_shell_script
-    run_shell_script(f"uv run --with machineconfig>=5.65,textual {path}")
+    run_shell_script(f"uv run --with machineconfig>=5.67,textual {path}")
 
 @config_apps.command(no_args_is_help=False)
 def pwsh_theme():

{machineconfig-5.67 → machineconfig-5.68}/src/machineconfig/scripts/python/devops_helpers/cli_self.py

@@ -31,9 +31,9 @@ def install():
     # main_public_from_parser()
     import platform
     if platform.system() == "Windows":
-        run_shell_script(r"""$HOME\.local\bin\uv.exe tool install machineconfig>=5.65""")
+        run_shell_script(r"""$HOME\.local\bin\uv.exe tool install machineconfig>=5.67""")
     else:
-        run_shell_script("""$HOME/.local/bin/uv tool install machineconfig>=5.65""")
+        run_shell_script("""$HOME/.local/bin/uv tool install machineconfig>=5.67""")
 
 @cli_app.command(no_args_is_help=False)
 def navigate():
@@ -42,7 +42,7 @@ def navigate():
     from pathlib import Path
     path = Path(navigator.__file__).resolve().parent.joinpath("devops_navigator.py")
     from machineconfig.utils.code import run_shell_script
-    run_shell_script(f"uv run --with machineconfig>=5.65,textual {path}")
+    run_shell_script(f"uv run --with machineconfig>=5.67,textual {path}")
 
 
 @cli_app.command(no_args_is_help=True)

{machineconfig-5.67 → machineconfig-5.68}/src/machineconfig/scripts/python/ftpx.py

@@ -105,7 +105,7 @@ def ftpx(
     from paramiko.ssh_exception import AuthenticationException  # type: ignore
 
     try:
-        ssh = SSH(rf"{machine}")
+        ssh = SSH(host=rf"{machine}", username=None, hostname=None, ssh_key_path=None, password=None, port=22, enable_compression=True)
     except AuthenticationException:
         console.print(
             Panel(
@@ -123,7 +123,7 @@ def ftpx(
         import getpass
 
         pwd = getpass.getpass()
-        ssh = SSH(rf"{machine}", pwd=pwd)
+        ssh = SSH(host=rf"{machine}", username=None, hostname=None, ssh_key_path=None, password=pwd, port=22, enable_compression=True)
 
     if cloud:
         console.print(
@@ -133,7 +133,7 @@ def ftpx(
                 border_style="cyan",
             )
         )
-        ssh.run(f"cloud_copy {resolved_source} :^", desc="Uploading from remote to the cloud.").print()
+        ssh.run_shell(command=f"cloud_copy {resolved_source} :^", verbose_output=True, description="Uploading from remote to the cloud.", strict_stderr=False, strict_return_code=False)
         console.print(
             Panel.fit(
                 "⬇️  Cloud transfer mode — downloading from cloud to local...",
@@ -141,7 +141,7 @@ def ftpx(
                 border_style="cyan",
             )
         )
-        ssh.run_locally(f"cloud_copy :^ {resolved_target}").print()
+        ssh.run_locally(command=f"cloud_copy :^ {resolved_target}")
         received_file = PathExtended(resolved_target)  # type: ignore
     else:
         if source_is_remote:
@@ -163,7 +163,7 @@ def ftpx(
                     padding=(1, 2),
                 )
             )
-            received_file = ssh.copy_to_here(source=resolved_source, target=resolved_target, z=zipFirst, r=recursive)
+            received_file = ssh.copy_to_here(source=resolved_source, target=resolved_target, z=zipFirst, r=recursive, init=True)
         else:
             assert resolved_source is not None, """
 ❌ Path Error: Target must be a remote path (machine:path)"""
@@ -183,7 +183,7 @@ def ftpx(
                     padding=(1, 2),
                 )
             )
-            received_file = ssh.copy_from_here(source=resolved_source, target=resolved_target, z=zipFirst, r=recursive)
+            received_file = ssh.copy_from_here(source_path=resolved_source, target_path=resolved_target, compress_with_zip=zipFirst, recursive=recursive, overwrite_existing=False)
 
     if source_is_remote and isinstance(received_file, PathExtended):
         console.print(

{machineconfig-5.67 → machineconfig-5.68}/src/machineconfig/scripts/python/interactive.py

@@ -130,9 +130,9 @@ def execute_installations(selected_options: list[str]) -> None:
         console.print(Panel("🐍 [bold green]PYTHON ENVIRONMENT[/bold green]\n[italic]Virtual environment setup[/italic]", border_style="green"))
         import platform
         if platform.system() == "Windows":
-            run_shell_script(r"""$HOME\.local\bin\uv.exe tool install machineconfig>=5.65""")
+            run_shell_script(r"""$HOME\.local\bin\uv.exe tool install machineconfig>=5.67""")
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install machineconfig>=5.65""")
+            run_shell_script("""$HOME/.local/bin/uv tool install machineconfig>=5.67""")
     if "install_ssh_server" in selected_options:
         console.print(Panel("🔒 [bold red]SSH SERVER[/bold red]\n[italic]Remote access setup[/italic]", border_style="red"))
         import platform

{machineconfig-5.67 → machineconfig-5.68}/src/machineconfig/scripts/python/nw/mount_nfs

@@ -5,7 +5,7 @@
 # mkdir ~/data/local
 # sudo mount -o nolock,noatime,nodiratime,proto=tcp,timeo=600,retrans=2,noac alex-p51s-5:/home/alex/data/local ./data/local
 
-uv run --python 3.14 --with machineconfig>=5.65python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with machineconfig>=5.67python -m machineconfig.scripts.python.mount_nfs
 # Check if remote server is reachable and share folder exists
 if ! ping -c 1 "$remote_server" &> /dev/null; then
   echo "💥 Error: Remote server $remote_server is not reachable."

{machineconfig-5.67 → machineconfig-5.68}/src/machineconfig/scripts/python/nw/mount_nfs.py

@@ -20,8 +20,8 @@ def main():
         tmp = choose_ssh_host(multi=False)
         assert isinstance(tmp, str)
         ssh = SSH(tmp)
-        default = f"{ssh.hostname}:{ssh.run('echo $HOME').op}/data/share_nfs"
-        share_info = choose_from_options(msg="📂 Choose a share path:", options=[f"{ssh.hostname}:{item.split(' ')[0]}" for item in ssh.run("cat /etc/exports").op.split("\n") if not item.startswith("#")] + [default], default=default, multi=False)
+        default = f"{ssh.hostname}:{ssh.run_shell('echo $HOME').op}/data/share_nfs"
+        share_info = choose_from_options(msg="📂 Choose a share path:", options=[f"{ssh.hostname}:{item.split(' ')[0]}" for item in ssh.run_shell("cat /etc/exports").op.split("\n") if not item.startswith("#")] + [default], default=default, multi=False)
         assert isinstance(share_info, str), f"❌ share_info must be a string. Got {type(share_info)}"
 
     remote_server = share_info.split(":")[0]

{machineconfig-5.67 → machineconfig-5.68}/src/machineconfig/scripts/python/nw/mount_ssh.py

@@ -19,7 +19,7 @@ def main():
         tmp = choose_ssh_host(multi=False)
         assert isinstance(tmp, str)
         ssh = SSH(host=tmp)
-        share_info = f"{ssh.username}@{ssh.hostname}:{ssh.run('echo $HOME').op}/data/share_ssh"
+        share_info = f"{ssh.username}@{ssh.hostname}:{ssh.run_shell('echo $HOME').op}/data/share_ssh"
     else:
         ssh = SSH(share_info.split(":")[0])
 

{machineconfig-5.67 → machineconfig-5.68}/src/machineconfig/scripts/python/repos_helpers/count_lines_frontend.py

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

{machineconfig-5.67 → machineconfig-5.68}/src/machineconfig/scripts/python/sessions.py

@@ -141,7 +141,7 @@ def get_app():
     layouts_app.command("create-from-function", no_args_is_help=True, help="Create a layout from a function")(create_from_function)
     layouts_app.command("run", no_args_is_help=True, help="Run the selected layout(s)")(run)
     layouts_app.command("balance-load", no_args_is_help=True, help="Balance the load across sessions")(balance_load)
-    layouts_app.command("kill-process", no_args_is_help=True, help="Choose a process to kill")(kill_process)
+    layouts_app.command("kill-process", no_args_is_help=False, help="Choose a process to kill")(kill_process)
     return layouts_app
 
 

{machineconfig-5.67 → machineconfig-5.68}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

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

{machineconfig-5.67 → machineconfig-5.68}/src/machineconfig/setup_linux/apps.sh

@@ -14,7 +14,6 @@ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
 echo "🔧 Configuring NVM environment..."
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
 echo "📥 Installing latest Node.js..."
 nvm install node || true
 echo "📥 Installing SQLite - lightweight SQL database..."

{machineconfig-5.67 → machineconfig-5.68}/src/machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -1,25 +1,25 @@
 #!/bin/bash
 . <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/uv.sh")
 devops() {
-    "$HOME/.local/bin/uv" run --python 3.14 --with machineconfig>=5.65 devops "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with machineconfig>=5.67 devops "$@"
 }
 agents() {
-    "$HOME/.local/bin/uv" run --python 3.14 --with machineconfig>=5.65 agents "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with machineconfig>=5.67 agents "$@"
 }
 cloud() {
-    "$HOME/.local/bin/uv" run --python 3.14 --with machineconfig>=5.65 cloud "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with machineconfig>=5.67 cloud "$@"
 }
 croshell() {
-    "$HOME/.local/bin/uv" run --python 3.14 --with machineconfig>=5.65 croshell "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with machineconfig>=5.67 croshell "$@"
 }
 fire() {
-    "$HOME/.local/bin/uv" run --python 3.14 --with machineconfig>=5.65fire "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with machineconfig>=5.67fire "$@"
 }
 ftpx() {
-    "$HOME/.local/bin/uv" run --python 3.14 --with machineconfig>=5.65ftpx "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with machineconfig>=5.67ftpx "$@"
 }
 sessions() {
-    "$HOME/.local/bin/uv" run --python 3.14 --with machineconfig>=5.65sessions "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with machineconfig>=5.67sessions "$@"
 }
 
 echo "devops command is now defined in this shell session."

{machineconfig-5.67 → machineconfig-5.68}/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -2,30 +2,30 @@
 
 iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/uv.ps1").Content
 function devops {
-    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig>=5.65 devops $args
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig>=5.67 devops $args
 }
 
 function cloud {
-    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig>=5.65 cloud $args
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig>=5.67 cloud $args
 }
 
 function croshell {
-    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig>=5.65 croshell $args
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig>=5.67 croshell $args
 }
 
 function agents {
-    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig>=5.65 agents $args
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig>=5.67 agents $args
 }
 
 function fire {
-    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig>=5.65 fire $args
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig>=5.67 fire $args
 }
 
 function ftpx {
-    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig>=5.65 ftpx $args
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig>=5.67 ftpx $args
 }
 
 function sessions {
-    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig>=5.65 sessions $args
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig>=5.67 sessions $args
 }