machineconfig 5.67__tar.gz → 5.69__tar.gz

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

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

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

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "5.67"
+version = "5.69"
 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.69}/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.69}/src/machineconfig/scripts/python/agents.py

@@ -9,19 +9,19 @@ from machineconfig.scripts.python.helpers_fire.fire_agents_helper_types import A
 
 
 def create(
-    agent: AGENTS = typer.Option(default=..., help=f"Agent type. One of {', '.join(get_args(AGENTS)[:3])}"),
-    machine: MATCHINE = typer.Option(default=..., help=f"Machine to run agents on. One of {', '.join(get_args(MATCHINE))}"),
-    model: MODEL = typer.Option(default=..., help=f"Model to use (for crush agent). One of {', '.join(get_args(MODEL)[:3])}"),
-    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"),
-    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."),
-    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."),
+    agent: AGENTS = typer.Option(..., "--agents", "-a", help=f"Agent type. One of {', '.join(get_args(AGENTS)[:3])}"),
+    machine: MATCHINE = typer.Option(..., "--machine", "-m", help=f"Machine to run agents on. One of {', '.join(get_args(MATCHINE))}"),
+    model: MODEL = typer.Option(..., "--model", "-M", help=f"Model to use (for crush agent). One of {', '.join(get_args(MODEL)[:3])}"),
+    provider: PROVIDER = typer.Option(..., "--provider", "-p", help=f"Provider to use (for crush agent). One of {', '.join(get_args(PROVIDER)[:3])}"),
+    context_path: Optional[Path] = typer.Option(None, "--context-path", "-c", help="Path to the context file/folder, defaults to .ai/todo/"),
+    separator: str = typer.Option("\n", "--separator", "-s", help="Separator for context"),
+    agent_load: int = typer.Option(13, "--agent-load", "-al", help="Number of tasks per prompt"),
+    prompt: Optional[str] = typer.Option(None, "--prompt", "-p", help="Prompt prefix as string"),
+    prompt_path: Optional[Path] = typer.Option(None, "--prompt-path", "-pp", help="Path to prompt file"),
+    job_name: str = typer.Option("AI_Agents", "--job-name", "-j", help="Job name"),
+    separate: bool = typer.Option(True, "--separate", "-sep", help="Keep prompt material in separate file to the context."),
+    output_path: Optional[Path] = typer.Option(None, "--output-path", "-o", help="Path to write the layout.json file"),
+    agents_dir: Optional[Path] = typer.Option(None, "--agents-dir", "-ad", help="Directory to store agent files. If not provided, will be constructed automatically."),
 ):
 
     from machineconfig.scripts.python.helpers_fire.fire_agents_help_launch import prep_agent_launch, get_agents_launch_layout
@@ -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"
@@ -164,7 +163,7 @@ def get_app():
     agents_app = typer.Typer(help="🤖 AI Agents management subcommands", no_args_is_help=True)
     sep = "\n"
     agents_full_help = f"""
-Create agents layout file, ready to run.
+[cr] Create agents layout file, ready to run.
 {sep}
 PROVIDER options: {', '.join(get_args(PROVIDER))}
 {sep}
@@ -173,13 +172,19 @@ AGENT options: {', '.join(get_args(AGENTS))}
 MODEL options: {sep.join(get_args(MODEL))}
 """
     agents_app.command("create", no_args_is_help=True, help=agents_full_help)(create)
-    agents_app.command("collect", no_args_is_help=True, help="Collect all agent materials into a single file.")(collect)
-    agents_app.command("make-template", no_args_is_help=False, help="Create a template for fire agents")(template)
-    agents_app.command("make-config", no_args_is_help=False, help="Initialize AI configurations in the current repository")(init_config)
+    agents_app.command("cr", 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="[cl] Collect all agent materials into a single file.")(collect)
+    agents_app.command("c", 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="[mt] Create a template for fire agents")(template)
+    agents_app.command("mt", no_args_is_help=False, help="Create a template for fire agents", hidden=True)(template)
+    agents_app.command("make-config", no_args_is_help=False, help="[mc] Initialize AI configurations in the current repository")(init_config)
+    agents_app.command("mc", 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="Generate a markdown file listing all Python files in the repo")(main)
+    agents_app.command("make-todo", no_args_is_help=True, help="[mt] Generate a markdown file listing all Python files in the repo")(main)
+    agents_app.command("mt", 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
-    agents_app.command(name="make-symlinks", no_args_is_help=True, help="Create symlinks to the current repo in ~/code_copies/")(create_symlink_command)
+    agents_app.command(name="make-symlinks", no_args_is_help=True, help="[ms] Create symlinks to the current repo in ~/code_copies/")(create_symlink_command)
+    agents_app.command(name="ms", no_args_is_help=True, help="Create symlinks to the current repo in ~/code_copies/", hidden=True)(create_symlink_command)
     return agents_app
 
 

{machineconfig-5.67 → machineconfig-5.69}/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.69}/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.69}/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.69}/src/machineconfig/scripts/python/devops.py

@@ -12,20 +12,26 @@ import machineconfig.scripts.python.devops_helpers.cli_nw as cli_network
 
 def get_app():
     app = typer.Typer(help="🛠️ DevOps operations", no_args_is_help=True, add_completion=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[str] = typer.Option(None, "--group", "-g", help="Groups names. A group is bundle of apps. See available groups when running interactively."),
+    def install(which: Optional[str] = typer.Argument(None, help="Comma-separated list of program names to install, or group name if --group flag is set."),
+        group: bool = typer.Option(False, "--group", "-g", help="Treat 'which' as a group name. A group is bundle of apps."),
         interactive: bool = typer.Option(False, "--interactive", "-ia", help="Interactive selection of programs to install."),
     ) -> None:
         """📦 Install essential packages"""
         import machineconfig.utils.installer_utils.installer as installer_entry_point
         installer_entry_point.main(which=which, group=group, interactive=interactive)
     _ = install
-    app.add_typer(cli_repos.app, name="repos")
-    app.add_typer(cli_config.config_apps, name="config")
+    app.command("install", no_args_is_help=True, help="🛠️  [i] Install essential packages")(install)
+    app.command("i", no_args_is_help=True, help="Install essential packages", hidden=True)(install)
+    app.add_typer(cli_repos.get_app(), name="repos")
+    app.add_typer(cli_repos.get_app(), name="r", hidden=True)
+    app.add_typer(cli_config.get_app(), name="config")
+    app.add_typer(cli_config.get_app(), name="c", hidden=True)
     app.add_typer(cli_data.app_data, name="data")
-    app.add_typer(cli_self.cli_app, name="self")
-    app.add_typer(cli_network.nw_apps, name="network")
+    app.add_typer(cli_data.app_data, name="d", hidden=True)
+    app.add_typer(cli_self.get_app(), name="self")
+    app.add_typer(cli_self.get_app(), name="s", hidden=True)
+    app.add_typer(cli_network.get_app(), name="network")
+    app.add_typer(cli_network.get_app(), name="n", hidden=True)
     return app
 
 def main():

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

@@ -4,10 +4,8 @@ from typing import Literal, Annotated, Optional
 from pathlib import Path
 import typer
 
-config_apps = typer.Typer(help="⚙️ Configuration subcommands", no_args_is_help=True)
 
 
-@config_apps.command(no_args_is_help=True)
 def private(method: Literal["symlink", "copy"] = typer.Option(..., "--method", "-m", help="Method to use for linking files"),
                              on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"] = typer.Option("throwError", "--on-conflict", "-o", help="Action to take on conflict"),
                              which: Optional[str] = typer.Option(None, "--which", "-w", help="Specific items to process"),
@@ -16,7 +14,6 @@ def private(method: Literal["symlink", "copy"] = typer.Option(..., "--method", "
     import machineconfig.profile.create_links_export as create_links_export
     create_links_export.main_private_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
 
-@config_apps.command(no_args_is_help=True)
 def public(method: Literal["symlink", "copy"] = typer.Option(..., "--method", "-m", help="Method to use for setting up the config file."),
                             on_conflict: Literal["throwError", "overwriteDefaultPath", "backupDefaultPath"] = typer.Option("throwError", "--on-conflict", "-o", help="Action to take on conflict"),
                             which: Optional[str] = typer.Option(None, "--which", "-w", help="Specific items to process"),
@@ -25,7 +22,6 @@ def public(method: Literal["symlink", "copy"] = typer.Option(..., "--method", "-
     import machineconfig.profile.create_links_export as create_links_export
     create_links_export.main_public_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
 
-@config_apps.command(no_args_is_help=True)
 def dotfile(file: Annotated[str, typer.Argument(help="file/folder path.")],
     overwrite: Annotated[bool, typer.Option("--overwrite", "-o", help="Overwrite.")] = False,
     dest: Annotated[str, typer.Option("--dest", "-d", help="destination folder")] = "",
@@ -35,22 +31,19 @@ def dotfile(file: Annotated[str, typer.Argument(help="file/folder path.")],
     dotfile_module.main(file=file, overwrite=overwrite, dest=dest)
 
 
-@config_apps.command(no_args_is_help=False)
 def shell():
     """🔗 Configure your shell profile."""
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     create_default_shell_profile()
 
-@config_apps.command(no_args_is_help=False)
 def path():
     """📚 NAVIGATE PATH variable with TUI"""
     from machineconfig.scripts.python import env_manager as navigator
     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():
     """🔗 Select powershell prompt theme."""
     import machineconfig.scripts.python.devops_helpers.themes as themes
@@ -58,12 +51,31 @@ def pwsh_theme():
     import subprocess
     subprocess.run(["pwsh", "-File", str(file)])
 
-@config_apps.command(no_args_is_help=False)
 def copy_assets(which: Literal["scripts", "settings", "both"] = typer.Option(..., "--which", "-w", help="Which assets to copy")):
     """🔗 Copy asset files from library to machine."""
     import machineconfig.profile.create_helper as create_helper
-    if which == "both":
-        create_helper.copy_assets_to_machine(which="scripts")
-        create_helper.copy_assets_to_machine(which="settings")
-    else:
-        create_helper.copy_assets_to_machine(which=which)
+    match which:
+        case "both":
+            create_helper.copy_assets_to_machine(which="scripts")
+            create_helper.copy_assets_to_machine(which="settings")
+        case _:
+            create_helper.copy_assets_to_machine(which=which)
+
+
+def get_app():
+    config_apps = typer.Typer(help="⚙️  [c] configuration subcommands", no_args_is_help=True)
+    config_apps.command("private", no_args_is_help=True, help="🔗  [p] Manage private configuration files.")(private)
+    config_apps.command("p", no_args_is_help=True, help="Manage private configuration files.", hidden=True)(private)
+    config_apps.command("public", no_args_is_help=True, help="🔗  [u] Manage public configuration files.")(public)
+    config_apps.command("u", no_args_is_help=True, help="Manage public configuration files.", hidden=True)(public)
+    config_apps.command("dotfile", no_args_is_help=True, help="🔗  [d] Manage dotfiles.")(dotfile)
+    config_apps.command("d", no_args_is_help=True, help="Manage dotfiles.", hidden=True)(dotfile)
+    config_apps.command("shell", no_args_is_help=True, help="🔗  [s] Configure your shell profile.")(shell)
+    config_apps.command("s", no_args_is_help=True, help="Configure your shell profile.", hidden=True)(shell)
+    config_apps.command("path", no_args_is_help=True, help="📚  [a] NAVIGATE PATH variable with TUI")(path)
+    config_apps.command("a", no_args_is_help=True, help="NAVIGATE PATH variable with TUI", hidden=True)(path)
+    config_apps.command("pwsh-theme", no_args_is_help=True, help="🔗  [t] Select powershell prompt theme.")(pwsh_theme)
+    config_apps.command("t", no_args_is_help=True, help="Select powershell prompt theme.", hidden=True)(pwsh_theme)
+    config_apps.command("copy-assets", no_args_is_help=True, help="🔗  [c] Copy asset files from library to machine.")
+    config_apps.command("c", no_args_is_help=True, help="Copy asset files from library to machine.", hidden=True)(copy_assets)
+    return config_apps

{machineconfig-5.67 → machineconfig-5.69}/src/machineconfig/scripts/python/devops_helpers/cli_data.py

@@ -1,7 +1,7 @@
 
 import typer
 
-app_data = typer.Typer(help="💾 Data subcommands", no_args_is_help=True)
+app_data = typer.Typer(help="💾 [d] data subcommands", no_args_is_help=True)
 
 @app_data.command()
 def backup():

{machineconfig-5.67 → machineconfig-5.69}/src/machineconfig/scripts/python/devops_helpers/cli_nw.py

@@ -4,13 +4,8 @@ import machineconfig.scripts.python.devops_helpers.cli_share_server as cli_share
 import typer
 from typing import Optional
 
-nw_apps = typer.Typer(help="🔐 Network subcommands", no_args_is_help=True)
 
 
-nw_apps.command(name="share-terminal", help="📡 Share terminal via web browser")(cli_terminal.main)
-nw_apps.command(name="share-server", help="🌐 Start local/global server to share files/folders via web browser", no_args_is_help=True)(cli_share_server.main)
-
-@nw_apps.command()
 def install_ssh_server():
     """📡 SSH install server"""
     import platform
@@ -23,7 +18,6 @@ def install_ssh_server():
     from machineconfig.utils.code import run_shell_script
     run_shell_script(script=SSH_SERVER.read_text(encoding="utf-8"))
 
-@nw_apps.command(no_args_is_help=True)
 def add_ssh_key(path: Optional[str] = typer.Option(None, help="Path to the public key file"),
          choose: bool = typer.Option(False, "--choose", "-c", help="Choose from available public keys in ~/.ssh/*.pub"),
          value: bool = typer.Option(False, "--value", "-v", help="Paste the public key content manually"),
@@ -32,8 +26,21 @@ def add_ssh_key(path: Optional[str] = typer.Option(None, help="Path to the publi
     """🔑 SSH add pub key to this machine so its accessible by owner of corresponding private key."""
     import machineconfig.scripts.python.devops_helpers.devops_add_ssh_key as helper
     helper.main(pub_path=path, pub_choose=choose, pub_val=value, from_github=github)
-@nw_apps.command()
 def add_ssh_identity():
     """🗝️ SSH add identity (private key) to this machine"""
     import machineconfig.scripts.python.devops_helpers.devops_add_identity as helper
     helper.main()
+
+def get_app():
+    nw_apps = typer.Typer(help="🔐 [n] Network subcommands", no_args_is_help=True)
+    nw_apps.command(name="share-terminal", help="📡  [t] Share terminal via web browser")(cli_terminal.main)
+    nw_apps.command(name="t", help="Share terminal via web browser", hidden=True)(cli_terminal.main)
+    nw_apps.command(name="share-server", help="🌐  [s] Start local/global server to share files/folders via web browser", no_args_is_help=True)(cli_share_server.main)
+    nw_apps.command(name="s", help="Start local/global server to share files/folders via web browser", hidden=True, no_args_is_help=True)(cli_share_server.main)
+    nw_apps.command(name="install-ssh-server", help="📡  [i] Install SSH server")(install_ssh_server)
+    nw_apps.command(name="i", help="Install SSH server", hidden=True)(install_ssh_server)
+    nw_apps.command(name="add-ssh-key", help="🔑  [k] Add SSH public key to this machine")(add_ssh_key)
+    nw_apps.command(name="k", help="Add SSH public key to this machine", hidden=True)(add_ssh_key)
+    nw_apps.command(name="add-ssh-identity", help="🗝️  [a] Add SSH identity (private key) to this machine")(add_ssh_identity)
+    nw_apps.command(name="a", help="Add SSH identity (private key) to this machine", hidden=True)(add_ssh_identity)
+    return nw_apps

{machineconfig-5.67 → machineconfig-5.69}/src/machineconfig/scripts/python/devops_helpers/cli_repos.py

@@ -11,24 +11,18 @@ import typer
 from machineconfig.scripts.python.helpers_repos.secure_repo import main as secure_repo_main
 
 
-app = typer.Typer(help="📁 Manage development repositories", no_args_is_help=True)
-sync_app = typer.Typer(help="🔄 Manage repository specifications and syncing", no_args_is_help=True)
-app.add_typer(sync_app, name="mirror", help="🔄 mirror repositories using saved specs")
-
 DirectoryArgument = Annotated[Optional[str], typer.Argument(help="📁 Directory containing repo(s).")]
 RecursiveOption = Annotated[bool, typer.Option("--recursive", "-r", help="🔍 Recurse into nested repositories.")]
 NoSyncOption = Annotated[bool, typer.Option("--no-sync", help="🚫 Disable automatic uv sync after pulls.")]
 CloudOption = Annotated[Optional[str], typer.Option("--cloud", "-c", help="☁️ Upload to or download from this cloud remote.")]
 
 
-@app.command(no_args_is_help=True)
 def push(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_sync: NoSyncOption = False) -> None:
     """🚀 Push changes across repositories."""
     from machineconfig.scripts.python.repos_helpers.entrypoint import git_operations
     git_operations(directory, pull=False, commit=False, push=True, recursive=recursive, no_sync=no_sync)
 
 
-@app.command(no_args_is_help=True)
 def pull(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_sync: NoSyncOption = False) -> None:
     """⬇️ Pull changes across repositories."""
     from machineconfig.scripts.python.repos_helpers.entrypoint import git_operations
@@ -36,7 +30,6 @@ def pull(directory: DirectoryArgument = None, recursive: RecursiveOption = False
     git_operations(directory, pull=True, commit=False, push=False, recursive=recursive, no_sync=no_sync)
 
 
-@app.command(no_args_is_help=True)
 def commit(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_sync: NoSyncOption = False) -> None:
     """💾 Commit changes across repositories."""
     from machineconfig.scripts.python.repos_helpers.entrypoint import git_operations
@@ -44,14 +37,12 @@ def commit(directory: DirectoryArgument = None, recursive: RecursiveOption = Fal
     git_operations(directory, pull=False, commit=True, push=False, recursive=recursive, no_sync=no_sync)
 
 
-@app.command(no_args_is_help=True)
 def sync(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_sync: NoSyncOption = False) -> None:
     """🔄 Pull, commit, and push changes across repositories."""
     from machineconfig.scripts.python.repos_helpers.entrypoint import git_operations
     git_operations(directory, pull=True, commit=True, push=True, recursive=recursive, no_sync=no_sync)
 
 
-@sync_app.command(no_args_is_help=True)
 def capture(directory: DirectoryArgument = None, cloud: CloudOption = None) -> None:
     """📝 Record repositories into a repos.json specification."""
     from machineconfig.scripts.python.repos_helpers.entrypoint import resolve_directory
@@ -65,7 +56,6 @@ def capture(directory: DirectoryArgument = None, cloud: CloudOption = None) -> N
         PathExtended(save_path).to_cloud(rel2home=True, cloud=cloud)
 
 
-@sync_app.command(no_args_is_help=True)
 def clone(directory: DirectoryArgument = None, cloud: CloudOption = None) -> None:
     """📥 Clone repositories described by a repos.json specification."""
     from machineconfig.scripts.python.repos_helpers.entrypoint import clone_from_specs
@@ -74,7 +64,6 @@ def clone(directory: DirectoryArgument = None, cloud: CloudOption = None) -> Non
     clone_from_specs(directory, cloud, checkout_branch_flag=False, checkout_commit_flag=False)
 
 
-@sync_app.command(name="checkout-to-commit", no_args_is_help=True)
 def checkout_command(directory: DirectoryArgument = None, cloud: CloudOption = None) -> None:
     """🔀 Check out specific commits listed in the specification."""
     from machineconfig.scripts.python.repos_helpers.entrypoint import clone_from_specs
@@ -83,14 +72,12 @@ def checkout_command(directory: DirectoryArgument = None, cloud: CloudOption = N
     clone_from_specs(directory, cloud, checkout_branch_flag=False, checkout_commit_flag=True)
 
 
-@sync_app.command(name="checkout-to-branch", no_args_is_help=True)
 def checkout_to_branch_command(directory: DirectoryArgument = None, cloud: CloudOption = None) -> None:
     """🔀 Check out to the main branch defined in the specification."""
     from machineconfig.scripts.python.repos_helpers.entrypoint import clone_from_specs
     clone_from_specs(directory, cloud, checkout_branch_flag=True, checkout_commit_flag=False)
 
 
-@app.command(no_args_is_help=True)
 def analyze(directory: DirectoryArgument = None) -> None:
     """📊 Analyze repository development over time."""
     repo_path = directory if directory is not None else "."
@@ -99,10 +86,6 @@ def analyze(directory: DirectoryArgument = None) -> None:
     analyze_repo_development(repo_path=repo_path)
 
 
-app.command(name="secure", no_args_is_help=True, help="🔐 Securely sync git repository to/from cloud with encryption")(secure_repo_main)
-
-
-@app.command(no_args_is_help=True)
 def viz(
     repo: str = typer.Option(Path.cwd().__str__(), "--repo", "-r", help="Path to git repository to visualize"),
     output_file: Optional[Path] = typer.Option(None, "--output", "-o", help="Output video file (e.g., output.mp4). If specified, gource will render to video."),
@@ -134,7 +117,7 @@ def viz(
               file_idle_time=file_idle_time, framerate=framerate, background_color=background_color,
               font_size=font_size, camera_mode=camera_mode)
 
-@app.command(no_args_is_help=True)
+
 def cleanup(repo: DirectoryArgument = None, recursive: RecursiveOption = False) -> None:
     """🧹 Clean repository directories from cache files."""
     if repo is None:
@@ -169,3 +152,38 @@ uv run --with cleanpy cleanpy .
 """
         from machineconfig.utils.code import run_shell_script
         run_shell_script(script)
+
+
+def get_app():
+    repos_apps = typer.Typer(help="📁 [r] Manage development repositories", no_args_is_help=True)
+    mirror_app = typer.Typer(help="🔄 [m] Manage repository specifications and syncing", no_args_is_help=True)
+    repos_apps.add_typer(mirror_app, name="mirror", help="🔄  [m] mirror repositories using saved specs")
+    repos_apps.add_typer(mirror_app, name="m", help="mirror repositories using saved specs", hidden=True)
+
+    repos_apps.command(name="push", help="🚀  [p] Push changes across repositories")(push)
+    repos_apps.command(name="p", help="Push changes across repositories", hidden=True)(push)
+    repos_apps.command(name="pull", help="⬇️   [P] Pull changes across repositories")(pull)
+    repos_apps.command(name="P", help="Pull changes across repositories", hidden=True)(pull)
+    repos_apps.command(name="commit", help="💾  [c] Commit changes across repositories")(commit)
+    repos_apps.command(name="c", help="Commit changes across repositories", hidden=True)(commit)
+    repos_apps.command(name="sync", help="🔄  [s] Pull, commit, and push changes across repositories")(sync)
+    repos_apps.command(name="s", help="Pull, commit, and push changes across repositories", hidden=True)(sync)
+    repos_apps.command(name="analyze", help="📊  [a] Analyze repository development over time")(analyze)
+    repos_apps.command(name="a", help="Analyze repository development over time", hidden=True)(analyze)
+    repos_apps.command(name="secure", help="🔐  [s] Securely sync git repository to/from cloud with encryption")(secure_repo_main)
+    repos_apps.command(name="s", help="Securely sync git repository to/from cloud with encryption", hidden=True)(secure_repo_main)
+    repos_apps.command(name="viz", help="🎬  [v] Visualize repository activity using Gource")(viz)
+    repos_apps.command(name="v", help="Visualize repository activity using Gource", hidden=True)(viz)
+    repos_apps.command(name="cleanup", help="🧹  [n] Clean repository directories from cache files")(cleanup)
+    repos_apps.command(name="n", help="Clean repository directories from cache files", hidden=True)(cleanup)
+
+    mirror_app.command(name="capture", help="📝  [cap] Record repositories into a repos.json specification")(capture)
+    mirror_app.command(name="cap", help="Record repositories into a repos.json specification", hidden=True)(capture)
+    mirror_app.command(name="clone", help="📥  [clo] Clone repositories described by a repos.json specification")(clone)
+    mirror_app.command(name="clo", help="Clone repositories described by a repos.json specification", hidden=True)(clone)
+    mirror_app.command(name="checkout-to-commit", help="🔀  [ctc] Check out specific commits listed in the specification")(checkout_command)
+    mirror_app.command(name="ctc", help="Check out specific commits listed in the specification", hidden=True)(checkout_command)
+    mirror_app.command(name="checkout-to-branch", help="🔀  [ctb] Check out to the main branch defined in the specification")(checkout_to_branch_command)
+    mirror_app.command(name="ctb", help="Check out to the main branch defined in the specification", hidden=True)(checkout_to_branch_command)
+
+    return repos_apps

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

@@ -2,26 +2,20 @@
 import typer
 from typing import Optional
 
-cli_app = typer.Typer(help="🔄 SELF operations subcommands", no_args_is_help=True)
 
-
-@cli_app.command()
 def update():
     """🔄 UPDATE essential repos"""
     import machineconfig.scripts.python.devops_helpers.devops_update_repos as helper
     helper.main()
-@cli_app.command()
 def interactive():
     """🤖 INTERACTIVE configuration of machine."""
     from machineconfig.scripts.python.interactive import main
     main()
 
-@cli_app.command()
 def status():
     """📊 STATUS of machine, shell profile, apps, symlinks, dotfiles, etc."""
     import machineconfig.scripts.python.devops_helpers.devops_status as helper
     helper.main()
-@cli_app.command()
 def install():
     """📋 CLONE machienconfig locally and incorporate to shell profile for faster execution and nightly updates."""
     from machineconfig.utils.code import run_shell_script
@@ -31,21 +25,19 @@ 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():
     """📚 NAVIGATE command structure with TUI"""
     import machineconfig.scripts.python as navigator
     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)
 def run_python(ip: str = typer.Argument(..., help="Python command to run in the machineconfig environment"),
                command: Optional[bool] = typer.Option(False, "--command", "-c", help="Run as command")):
     """🐍 RUN python command/file in the machineconfig environment"""
@@ -56,3 +48,19 @@ def run_python(ip: str = typer.Argument(..., help="Python command to run in the
     import subprocess
     import sys
     subprocess.run([sys.executable, ip], cwd=machineconfig.__path__[0])
+
+def get_app():
+    cli_app = typer.Typer(help="🔄 [s] self operations subcommands", no_args_is_help=True)
+    cli_app.command("update", no_args_is_help=True, help="🔄  [u] UPDATE essential repos")(update)
+    cli_app.command("u", no_args_is_help=True, help="UPDATE essential repos", hidden=True)(update)
+    cli_app.command("interactive", no_args_is_help=True, help="🤖  [ia] INTERACTIVE configuration of machine.")(interactive)
+    cli_app.command("ia", no_args_is_help=True, help="INTERACTIVE configuration of machine.", hidden=True)(interactive)
+    cli_app.command("status", no_args_is_help=True, help="📊  [s] STATUS of machine, shell profile, apps, symlinks, dotfiles, etc.")(status)
+    cli_app.command("s", no_args_is_help=True, help="STATUS of machine, shell profile, apps, symlinks, dotfiles, etc.", hidden=True)(status)
+    cli_app.command("install", no_args_is_help=True, help="📋  [i] CLONE machienconfig locally and incorporate to shell profile for faster execution and nightly updates.")(install)
+    cli_app.command("i", no_args_is_help=True, help="CLONE machienconfig locally and incorporate to shell profile for faster execution and nightly updates.", hidden=True)(install)
+    cli_app.command("navigate", no_args_is_help=True, help="📚  [n] NAVIGATE command structure with TUI")(navigate)
+    cli_app.command("n", no_args_is_help=True, help="NAVIGATE command structure with TUI", hidden=True)(navigate)
+    cli_app.command("python", no_args_is_help=False, help="🐍 [c] python command/file in the machineconfig environment")(run_python)
+    cli_app.command("c", no_args_is_help=False, help="RUN python command/file in the machineconfig environment", hidden=True)(run_python)
+    return cli_app