magmascript 3.2.1__tar.gz → 3.2.3__tar.gz

{magmascript-3.2.1 → magmascript-3.2.3}/PKG-INFO

@@ -1,13 +1,14 @@
 Metadata-Version: 2.4
 Name: magmascript
-Version: 3.2.1
+Version: 3.2.3
 Summary: Scripting toolkit with domain-first subcommands
 Author: Jake McCoy
 License-Expression: MIT
 Project-URL: Homepage, https://magmacrunch.com/ware/magmascript/
-Project-URL: Documentation, https://github.com/magmacrunchmedia/magmascript/wiki
-Project-URL: Repository, https://github.com/magmacrunchmedia/magmascript
-Project-URL: Changelog, https://github.com/magmacrunchmedia/magmascript/blob/main/CHANGELOG.md
+Project-URL: Documentation, https://github.com/magmacrunch-media/magmascript/wiki
+Project-URL: Repository, https://github.com/magmacrunch-media/magmascript
+Project-URL: Changelog, https://github.com/magmacrunch-media/magmascript/blob/main/CHANGELOG.md
+Project-URL: Funding, https://github.com/sponsors/magmacrunch-media
 Keywords: mcp,scripting,cli,magmacrunch
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
@@ -41,8 +42,30 @@ Scripting toolkit with domain-first subcommands for managing magmacrunch.com inf
 
 ## Install
 
+Requires Python >= 3.11.
+
+### pip (recommended)
+
+```bash
+pip install magmascript
+```
+
+### pipx (best for CLI-only usage)
+
 ```bash
-git clone https://github.com/magmacrunchmedia/magmascript.git
+pipx install magmascript
+```
+
+### Homebrew (macOS / Linux)
+
+```bash
+brew install magmacrunch-media/tap/magmascript
+```
+
+### Development
+
+```bash
+git clone https://github.com/magmacrunch-media/magmascript.git
 cd magmascript
 python3 -m venv .venv
 .venv/bin/pip install -e ".[all]"
@@ -73,7 +96,7 @@ user = "jake"
 
 [gh]
 token = "ghp_..."
-owner = "magmacrunchmedia"
+owner = "magmacrunch-media"
 repo = "magmacrunch.com"
 
 [project]
@@ -398,7 +421,7 @@ this ground was scorched at line 3 (garrisoned at line 1)
 
 `floorplan` is the only new reserved word; everything else is a shadowable
 builtin, so existing scripts are unaffected. Full reference on the
-[Asthenosphere wiki page](https://github.com/magmacrunchmedia/magmascript/wiki/Asthenosphere).
+[Asthenosphere wiki page](https://github.com/magmacrunch-media/magmascript/wiki/Asthenosphere).
 
 ### REPL
 
@@ -470,6 +493,10 @@ Also on the CLI: `magmascript mc1 status`, `mc1 info`, `mc1 processes`,
 `mc1 restart <service>`, `mc1 power`, `mc1 set-power-mode <always-on|sleep>`,
 `mc1 wake <mac>`, `mc1 reboot`.
 
+> **Note:** MC1 commands connect over SSH. Don't run them on MC1 itself — they
+> will try to SSH into the configured host, which on MC1 means connecting to
+> itself and hanging. Use these from your Mac, Pi, or any other machine.
+
 ### Mac Domain — Mac management (via SSH)
 ```magmascript
 // In a .mgs script, or: magmascript mac info
@@ -602,7 +629,7 @@ first use, not at startup, so a domain may hold real resources. Built-in domains
 win a name clash, and an entry point that fails to import is skipped rather than
 breaking the interpreter.
 
-[texastoast](https://github.com/magmacrunchmedia/texastoast) is the first:
+[texastoast](https://github.com/magmacrunch-media/texastoast) is the first:
 `pip install texastoast` and `.mgs` scripts can drive a game engine. It
 registers under two names, `texastoast` and the shorter `tt`.
 
@@ -651,24 +678,30 @@ gh_workflows             # GitHub commands
 
 ## Documentation
 
-Full documentation on the [Wiki](https://github.com/magmacrunchmedia/magmascript/wiki):
-- [MagmaScript Language](https://github.com/magmacrunchmedia/magmascript/wiki/MagmaScript-Language)
-- [Configuration](https://github.com/magmacrunchmedia/magmascript/wiki/Configuration)
-- [MCP Domain](https://github.com/magmacrunchmedia/magmascript/wiki/MCP-Domain)
-- [Pi Domain](https://github.com/magmacrunchmedia/magmascript/wiki/Pi-Domain)
-- [MC1 Domain](https://github.com/magmacrunchmedia/magmascript/wiki/MC1-Domain)
-- [Mac Domain](https://github.com/magmacrunchmedia/magmascript/wiki/Mac-Domain)
-- [GitHub Domain](https://github.com/magmacrunchmedia/magmascript/wiki/GitHub-Domain)
-- [Scores Domain](https://github.com/magmacrunchmedia/magmascript/wiki/Scores-Domain)
-- [Rights Domain](https://github.com/magmacrunchmedia/magmascript/wiki/Rights-Domain)
-- [Archive Domain](https://github.com/magmacrunchmedia/magmascript/wiki/Archive-Domain)
-- [Last.fm Domain](https://github.com/magmacrunchmedia/magmascript/wiki/Last.fm-Domain)
-- [MusicBrainz Domain](https://github.com/magmacrunchmedia/magmascript/wiki/MusicBrainz-Domain)
-- [Search Domain](https://github.com/magmacrunchmedia/magmascript/wiki/Search-Domain)
-- [Media Domain](https://github.com/magmacrunchmedia/magmascript/wiki/Media-Domain)
-- [Example Scripts](https://github.com/magmacrunchmedia/magmascript/wiki/Example-Scripts)
-- [Asthenosphere](https://github.com/magmacrunchmedia/magmascript/wiki/Asthenosphere)
-- [Architecture](https://github.com/magmacrunchmedia/magmascript/wiki/Architecture)
+Full documentation on the [Wiki](https://github.com/magmacrunch-media/magmascript/wiki):
+- [MagmaScript Language](https://github.com/magmacrunch-media/magmascript/wiki/MagmaScript-Language)
+- [Configuration](https://github.com/magmacrunch-media/magmascript/wiki/Configuration)
+- [MCP Domain](https://github.com/magmacrunch-media/magmascript/wiki/MCP-Domain)
+- [Pi Domain](https://github.com/magmacrunch-media/magmascript/wiki/Pi-Domain)
+- [MC1 Domain](https://github.com/magmacrunch-media/magmascript/wiki/MC1-Domain)
+- [Mac Domain](https://github.com/magmacrunch-media/magmascript/wiki/Mac-Domain)
+- [GitHub Domain](https://github.com/magmacrunch-media/magmascript/wiki/GitHub-Domain)
+- [Scores Domain](https://github.com/magmacrunch-media/magmascript/wiki/Scores-Domain)
+- [Rights Domain](https://github.com/magmacrunch-media/magmascript/wiki/Rights-Domain)
+- [Archive Domain](https://github.com/magmacrunch-media/magmascript/wiki/Archive-Domain)
+- [Last.fm Domain](https://github.com/magmacrunch-media/magmascript/wiki/Last.fm-Domain)
+- [MusicBrainz Domain](https://github.com/magmacrunch-media/magmascript/wiki/MusicBrainz-Domain)
+- [Search Domain](https://github.com/magmacrunch-media/magmascript/wiki/Search-Domain)
+- [Media Domain](https://github.com/magmacrunch-media/magmascript/wiki/Media-Domain)
+- [Example Scripts](https://github.com/magmacrunch-media/magmascript/wiki/Example-Scripts)
+- [Asthenosphere](https://github.com/magmacrunch-media/magmascript/wiki/Asthenosphere)
+- [Architecture](https://github.com/magmacrunch-media/magmascript/wiki/Architecture)
+
+## Support This Project
+
+If you find magmascript useful, consider supporting its development:
+
+[![Sponsor](https://img.shields.io/badge/%E2%9D%A4_Sponsor-pink)](https://github.com/sponsors/magmacrunch-media)
 
 ## License
 

{magmascript-3.2.1 → magmascript-3.2.3}/README.md

@@ -4,8 +4,30 @@ Scripting toolkit with domain-first subcommands for managing magmacrunch.com inf
 
 ## Install
 
+Requires Python >= 3.11.
+
+### pip (recommended)
+
+```bash
+pip install magmascript
+```
+
+### pipx (best for CLI-only usage)
+
 ```bash
-git clone https://github.com/magmacrunchmedia/magmascript.git
+pipx install magmascript
+```
+
+### Homebrew (macOS / Linux)
+
+```bash
+brew install magmacrunch-media/tap/magmascript
+```
+
+### Development
+
+```bash
+git clone https://github.com/magmacrunch-media/magmascript.git
 cd magmascript
 python3 -m venv .venv
 .venv/bin/pip install -e ".[all]"
@@ -36,7 +58,7 @@ user = "jake"
 
 [gh]
 token = "ghp_..."
-owner = "magmacrunchmedia"
+owner = "magmacrunch-media"
 repo = "magmacrunch.com"
 
 [project]
@@ -361,7 +383,7 @@ this ground was scorched at line 3 (garrisoned at line 1)
 
 `floorplan` is the only new reserved word; everything else is a shadowable
 builtin, so existing scripts are unaffected. Full reference on the
-[Asthenosphere wiki page](https://github.com/magmacrunchmedia/magmascript/wiki/Asthenosphere).
+[Asthenosphere wiki page](https://github.com/magmacrunch-media/magmascript/wiki/Asthenosphere).
 
 ### REPL
 
@@ -433,6 +455,10 @@ Also on the CLI: `magmascript mc1 status`, `mc1 info`, `mc1 processes`,
 `mc1 restart <service>`, `mc1 power`, `mc1 set-power-mode <always-on|sleep>`,
 `mc1 wake <mac>`, `mc1 reboot`.
 
+> **Note:** MC1 commands connect over SSH. Don't run them on MC1 itself — they
+> will try to SSH into the configured host, which on MC1 means connecting to
+> itself and hanging. Use these from your Mac, Pi, or any other machine.
+
 ### Mac Domain — Mac management (via SSH)
 ```magmascript
 // In a .mgs script, or: magmascript mac info
@@ -565,7 +591,7 @@ first use, not at startup, so a domain may hold real resources. Built-in domains
 win a name clash, and an entry point that fails to import is skipped rather than
 breaking the interpreter.
 
-[texastoast](https://github.com/magmacrunchmedia/texastoast) is the first:
+[texastoast](https://github.com/magmacrunch-media/texastoast) is the first:
 `pip install texastoast` and `.mgs` scripts can drive a game engine. It
 registers under two names, `texastoast` and the shorter `tt`.
 
@@ -614,24 +640,30 @@ gh_workflows             # GitHub commands
 
 ## Documentation
 
-Full documentation on the [Wiki](https://github.com/magmacrunchmedia/magmascript/wiki):
-- [MagmaScript Language](https://github.com/magmacrunchmedia/magmascript/wiki/MagmaScript-Language)
-- [Configuration](https://github.com/magmacrunchmedia/magmascript/wiki/Configuration)
-- [MCP Domain](https://github.com/magmacrunchmedia/magmascript/wiki/MCP-Domain)
-- [Pi Domain](https://github.com/magmacrunchmedia/magmascript/wiki/Pi-Domain)
-- [MC1 Domain](https://github.com/magmacrunchmedia/magmascript/wiki/MC1-Domain)
-- [Mac Domain](https://github.com/magmacrunchmedia/magmascript/wiki/Mac-Domain)
-- [GitHub Domain](https://github.com/magmacrunchmedia/magmascript/wiki/GitHub-Domain)
-- [Scores Domain](https://github.com/magmacrunchmedia/magmascript/wiki/Scores-Domain)
-- [Rights Domain](https://github.com/magmacrunchmedia/magmascript/wiki/Rights-Domain)
-- [Archive Domain](https://github.com/magmacrunchmedia/magmascript/wiki/Archive-Domain)
-- [Last.fm Domain](https://github.com/magmacrunchmedia/magmascript/wiki/Last.fm-Domain)
-- [MusicBrainz Domain](https://github.com/magmacrunchmedia/magmascript/wiki/MusicBrainz-Domain)
-- [Search Domain](https://github.com/magmacrunchmedia/magmascript/wiki/Search-Domain)
-- [Media Domain](https://github.com/magmacrunchmedia/magmascript/wiki/Media-Domain)
-- [Example Scripts](https://github.com/magmacrunchmedia/magmascript/wiki/Example-Scripts)
-- [Asthenosphere](https://github.com/magmacrunchmedia/magmascript/wiki/Asthenosphere)
-- [Architecture](https://github.com/magmacrunchmedia/magmascript/wiki/Architecture)
+Full documentation on the [Wiki](https://github.com/magmacrunch-media/magmascript/wiki):
+- [MagmaScript Language](https://github.com/magmacrunch-media/magmascript/wiki/MagmaScript-Language)
+- [Configuration](https://github.com/magmacrunch-media/magmascript/wiki/Configuration)
+- [MCP Domain](https://github.com/magmacrunch-media/magmascript/wiki/MCP-Domain)
+- [Pi Domain](https://github.com/magmacrunch-media/magmascript/wiki/Pi-Domain)
+- [MC1 Domain](https://github.com/magmacrunch-media/magmascript/wiki/MC1-Domain)
+- [Mac Domain](https://github.com/magmacrunch-media/magmascript/wiki/Mac-Domain)
+- [GitHub Domain](https://github.com/magmacrunch-media/magmascript/wiki/GitHub-Domain)
+- [Scores Domain](https://github.com/magmacrunch-media/magmascript/wiki/Scores-Domain)
+- [Rights Domain](https://github.com/magmacrunch-media/magmascript/wiki/Rights-Domain)
+- [Archive Domain](https://github.com/magmacrunch-media/magmascript/wiki/Archive-Domain)
+- [Last.fm Domain](https://github.com/magmacrunch-media/magmascript/wiki/Last.fm-Domain)
+- [MusicBrainz Domain](https://github.com/magmacrunch-media/magmascript/wiki/MusicBrainz-Domain)
+- [Search Domain](https://github.com/magmacrunch-media/magmascript/wiki/Search-Domain)
+- [Media Domain](https://github.com/magmacrunch-media/magmascript/wiki/Media-Domain)
+- [Example Scripts](https://github.com/magmacrunch-media/magmascript/wiki/Example-Scripts)
+- [Asthenosphere](https://github.com/magmacrunch-media/magmascript/wiki/Asthenosphere)
+- [Architecture](https://github.com/magmacrunch-media/magmascript/wiki/Architecture)
+
+## Support This Project
+
+If you find magmascript useful, consider supporting its development:
+
+[![Sponsor](https://img.shields.io/badge/%E2%9D%A4_Sponsor-pink)](https://github.com/sponsors/magmacrunch-media)
 
 ## License
 

{magmascript-3.2.1 → magmascript-3.2.3}/magmascript/__init__.py

@@ -1,6 +1,6 @@
 """magmascript — a scripting toolkit with domain-first subcommands."""
 
-__version__ = "3.2.1"
+__version__ = "3.2.2"
 
 from magmascript.core.config import Config, GHConfig, MediaConfig, MC1Config, PIConfig, get_config, load_config, set_config
 from magmascript.core.registry import get_domain, list_domains, register_domain

{magmascript-3.2.1 → magmascript-3.2.3}/magmascript/cli.py

@@ -11,12 +11,46 @@ from __future__ import annotations
 
 import json
 import sys
+from functools import wraps
+from typing import Callable
 
 from magmascript.core.config import get_config
 from magmascript.core.exceptions import MagmascriptError
 from magmascript.core.output import format_output
 
 
+# -- command registry ----------------------------------------------------
+
+COMMANDS: dict[str, Callable] = {}
+
+
+def register(name: str, help_text: str = "") -> Callable:
+    """Decorator to register a CLI command handler.
+
+    The handler receives (action, args, fmt).
+    """
+    def decorator(fn: Callable) -> Callable:
+        COMMANDS[name] = fn
+        fn._help_text = help_text
+        return fn
+    return decorator
+
+
+def _domain_command(client_cls: type, dispatch_fn: Callable, help_text: str = "") -> Callable:
+    """Create a command handler that manages config, client lifecycle, and dispatch."""
+    def handler(action: str, args: list[str], fmt: str) -> None:
+        config = get_config()
+        client = client_cls(config)
+        try:
+            dispatch_fn(action, args, client, fmt)
+        finally:
+            close = getattr(client, "close", None)
+            if close:
+                close()
+    handler._help_text = help_text
+    return handler
+
+
 def _generate_channels_js(channels: list[dict]) -> str:
     """Generate visual/tv/channels.js from TV channel data."""
     lines = []
@@ -30,6 +64,212 @@ def _generate_channels_js(channels: list[dict]) -> str:
     return 'window.TV_CHANNELS = [\n' + ',\n'.join(lines) + '\n];\n'
 
 
+# -- register domain commands --------------------------------------------
+
+def _register_domains():
+    from magmascript.domains.mcp import MCPClient
+    from magmascript.domains.pi import PIClient
+    from magmascript.domains.mac import MacClient
+    from magmascript.domains.mc1 import MC1Client
+    from magmascript.domains.gh import GHClient
+    from magmascript.domains.media import MediaClient
+    from magmascript.domains.scores import ScoresClient
+    from magmascript.domains.rights import RightsClient
+    from magmascript.domains.archive import ArchiveClient
+    from magmascript.domains.mb import MusicBrainzClient
+    from magmascript.domains.lastfm import LastFmClient
+    from magmascript.domains.search import SearchClient
+
+    register("mcp")(_domain_command(MCPClient, _dispatch_mcp))
+    register("pi")(_domain_command(PIClient, _dispatch_pi))
+    register("mac")(_domain_command(MacClient, _dispatch_mac))
+    register("mc1")(_domain_command(MC1Client, _dispatch_mc1))
+    register("gh")(_domain_command(GHClient, _dispatch_gh))
+    register("media")(_domain_command(MediaClient, _dispatch_media))
+    register("scores")(_domain_command(ScoresClient, _dispatch_scores))
+    register("rights")(_domain_command(RightsClient, _dispatch_rights))
+
+    def _archive_handler(action, args, fmt):
+        from pathlib import Path
+        config = get_config()
+        project_root = Path(config.project.root) if config.project.root else None
+        client = ArchiveClient(project_root=project_root)
+        _dispatch_archive(action, args, client, fmt)
+
+    register("archive", "Archive page operations")(_archive_handler)
+
+    def _mb_handler(action, args, fmt):
+        from pathlib import Path
+        config = get_config()
+        project_root = Path(config.project.root) if config.project.root else None
+        client = MusicBrainzClient(project_root=project_root)
+        try:
+            _dispatch_mb(action, args, client, fmt)
+        finally:
+            client.close()
+
+    register("mb", "MusicBrainz API client")(_mb_handler)
+
+    def _lastfm_handler(action, args, fmt):
+        from pathlib import Path
+        config = get_config()
+        project_root = Path(config.project.root) if config.project.root else None
+        try:
+            client = LastFmClient(project_root=project_root)
+        except MagmascriptError as e:
+            if action and action != "--help":
+                print(f"Error: {e}", file=sys.stderr)
+                sys.exit(1)
+            client = None
+        try:
+            _dispatch_lastfm(action, args, client, fmt)
+        finally:
+            if client:
+                client.close()
+
+    register("lastfm", "Last.fm API client")(_lastfm_handler)
+
+    def _search_handler(action, args, fmt):
+        from pathlib import Path
+        config = get_config()
+        project_root = Path(config.project.root) if config.project.root else None
+        client = SearchClient(project_root=project_root)
+        _dispatch_search(action, args, client, fmt)
+
+    register("search", "Site search index builder")(_search_handler)
+
+
+# -- register built-in meta commands ------------------------------------
+
+@register("run", "Run a MagmaScript (.mgs) file")
+def _cmd_run(action: str, args: list[str], fmt: str) -> None:
+    _dispatch_run(action, args)
+
+
+@register("repl", "Start interactive MagmaScript REPL")
+def _cmd_repl(action: str, args: list[str], fmt: str) -> None:
+    from magmascript.repl import repl
+    repl()
+
+
+@register("configure", "Fetch API key from MCP server")
+def _cmd_configure(action: str, args: list[str], fmt: str) -> None:
+    _dispatch_configure(action, args)
+
+
+@register("magma", "Show system status dashboard")
+def _cmd_magma(action: str, args: list[str], fmt: str) -> None:
+    _dispatch_magma(action, fmt)
+
+
+@register("crunch", "Run a batch pipeline")
+def _cmd_crunch(action: str, args: list[str], fmt: str) -> None:
+    _dispatch_crunch(action, args, fmt)
+
+
+@register("texas", "Full/heavy operation")
+def _cmd_texas(action: str, args: list[str], fmt: str) -> None:
+    _dispatch_texas(action, args, fmt)
+
+
+@register("toast", "Burn/clear caches")
+def _cmd_toast(action: str, args: list[str], fmt: str) -> None:
+    _dispatch_toast(action, args, fmt)
+
+
+@register("cache", "Cache management")
+def _cmd_cache(action: str, args: list[str], fmt: str) -> None:
+    _dispatch_cache(action, args, fmt)
+
+
+@register("codegen", "Generate C code from .mgs files")
+def _cmd_codegen(action: str, args: list[str], fmt: str) -> None:
+    """Dispatch codegen subcommands."""
+    if not action or action == "--help":
+        print("""Generate C code from MagmaScript (.mgs) files.
+
+Usage:
+    magmascript codegen <file.mgs>           Generate C to stdout
+    magmascript codegen <file.mgs> -o out.c  Generate C to file
+
+Options:
+    --help    Show this help
+""")
+        sys.exit(0)
+
+    from pathlib import Path
+    script_path = Path(action)
+    if not script_path.exists():
+        print(f"Error: File not found: {script_path}", file=sys.stderr)
+        sys.exit(1)
+
+    if not script_path.suffix == ".mgs":
+        print(f"Warning: File does not have .mgs extension: {script_path}", file=sys.stderr)
+
+    try:
+        source = script_path.read_text(encoding="utf-8")
+        from magmascript.lang.lexer import Lexer
+        from magmascript.lang.parser import Parser
+        from magmascript.codegen import generate_c
+
+        filename = str(script_path)
+        tokens = Lexer(source, filename=filename).tokenize()
+        program = Parser(tokens, source=source, filename=filename).parse()
+
+        c_code = generate_c(program)
+
+        # Check for -o flag
+        output_file = None
+        if "-o" in args:
+            idx = args.index("-o")
+            if idx + 1 < len(args):
+                output_file = args[idx + 1]
+
+        if output_file:
+            Path(output_file).write_text(c_code)
+            print(f"Generated {output_file}")
+        else:
+            print(c_code)
+
+    except Exception as e:
+        if hasattr(e, "format"):
+            print(e.format(), file=sys.stderr)
+        else:
+            print(f"Error: {e}", file=sys.stderr)
+        sys.exit(1)
+
+
+@register("scaffold", "Generate project structures and boilerplate")
+def _cmd_scaffold(action: str, args: list[str], fmt: str) -> None:
+    """Dispatch scaffold subcommands."""
+    if not action or action == "--help":
+        print("""Generate MagmaScript project structures and boilerplate.
+
+Usage:
+    magmascript scaffold module <name>   Generate a new module with tests
+
+Options:
+    --help    Show this help
+""")
+        sys.exit(0)
+
+    if action == "module":
+        if not args:
+            print("Error: Module name required. Usage: magmascript scaffold module <name>", file=sys.stderr)
+            sys.exit(1)
+
+        name = args[0]
+        from magmascript.scaffold import scaffold_module
+        path = scaffold_module(name)
+        print(f"Created module: {path}")
+        print(f"  {path / name}.mgs")
+        print(f"  {path / 'tests' / f'test_{name}.mgs'}")
+
+    else:
+        print(f"Unknown scaffold type: {action!r}. Available: module", file=sys.stderr)
+        sys.exit(1)
+
+
 def usage():
     print("""magmascript — scripting toolkit with domain-first subcommands
 
@@ -197,147 +437,17 @@ def main():
         no_cache = True
         rest.remove("--no-cache")
 
-    config = get_config()
+    # Register domain commands (lazy, on first use)
+    if not COMMANDS:
+        _register_domains()
 
     try:
-        if domain == "mcp":
-            from magmascript.domains.mcp import MCPClient
-            client = MCPClient(config)
-            try:
-                _dispatch_mcp(action, rest, client, fmt)
-            finally:
-                client.close()
-
-        elif domain == "pi":
-            from magmascript.domains.pi import PIClient
-            client = PIClient(config)
-            try:
-                _dispatch_pi(action, rest, client, fmt)
-            finally:
-                client.close()
-
-        elif domain == "mac":
-            from magmascript.domains.mac import MacClient
-            client = MacClient(config)
-            try:
-                _dispatch_mac(action, rest, client, fmt)
-            finally:
-                client.close()
-
-        elif domain == "mc1":
-            from magmascript.domains.mc1 import MC1Client
-            client = MC1Client(config)
-            try:
-                _dispatch_mc1(action, rest, client, fmt)
-            finally:
-                client.close()
-
-        elif domain == "gh":
-            from magmascript.domains.gh import GHClient
-            client = GHClient(config)
-            try:
-                _dispatch_gh(action, rest, client, fmt)
-            finally:
-                client.close()
-
-        elif domain == "media":
-            from magmascript.domains.media import MediaClient
-            client = MediaClient(config)
-            try:
-                _dispatch_media(action, rest, client, fmt)
-            finally:
-                client.close()
-
-        elif domain == "scores":
-            from magmascript.domains.scores import ScoresClient
-            client = ScoresClient(config)
-            try:
-                _dispatch_scores(action, rest, client, fmt)
-            finally:
-                client.close()
-
-        elif domain == "rights":
-            from magmascript.domains.rights import RightsClient
-            client = RightsClient(config)
-            try:
-                _dispatch_rights(action, rest, client, fmt)
-            finally:
-                client.close()
-
-        elif domain == "archive":
-            from pathlib import Path
-            from magmascript.domains.archive import ArchiveClient
-            project_root = Path(config.project.root) if config.project.root else None
-            client = ArchiveClient(project_root=project_root)
-            try:
-                _dispatch_archive(action, rest, client, fmt)
-            finally:
-                pass  # ArchiveClient doesn't have a close method
-
-        elif domain == "mb":
-            from pathlib import Path
-            from magmascript.domains.mb import MusicBrainzClient
-            project_root = Path(config.project.root) if config.project.root else None
-            client = MusicBrainzClient(project_root=project_root)
-            try:
-                _dispatch_mb(action, rest, client, fmt)
-            finally:
-                client.close()
-
-        elif domain == "lastfm":
-            from pathlib import Path
-            from magmascript.domains.lastfm import LastFmClient
-            project_root = Path(config.project.root) if config.project.root else None
-            try:
-                client = LastFmClient(project_root=project_root)
-            except MagmascriptError as e:
-                if action and action != "--help":
-                    print(f"Error: {e}", file=sys.stderr)
-                    sys.exit(1)
-                client = None
-            try:
-                _dispatch_lastfm(action, rest, client, fmt)
-            finally:
-                if client:
-                    client.close()
-
-        elif domain == "search":
-            from pathlib import Path
-            from magmascript.domains.search import SearchClient
-            project_root = Path(config.project.root) if config.project.root else None
-            client = SearchClient(project_root=project_root)
-            try:
-                _dispatch_search(action, rest, client, fmt)
-            finally:
-                pass  # SearchClient doesn't have a close method
-
-        elif domain == "cache":
-            _dispatch_cache(action, rest, fmt)
-
-        elif domain == "run":
-            _dispatch_run(action, rest)
-
-        elif domain == "repl":
-            from magmascript.repl import repl
-            repl()
-
-        elif domain == "configure":
-            _dispatch_configure(action, rest)
-
-        elif domain == "magma":
-            _dispatch_magma(action, fmt)
-
-        elif domain == "crunch":
-            _dispatch_crunch(action, rest, fmt)
-
-        elif domain == "texas":
-            _dispatch_texas(action, rest, fmt)
-
-        elif domain == "toast":
-            _dispatch_toast(action, rest, fmt)
-
+        cmd = COMMANDS.get(domain)
+        if cmd:
+            cmd(action, rest, fmt)
         else:
-            print(f"Unknown domain: {domain!r}. Available: mcp, pi, gh, media, scores, rights, archive, mb, lastfm, search, cache, run, repl, configure, magma, crunch, texas, toast", file=sys.stderr)
+            available = ", ".join(sorted(COMMANDS.keys()))
+            print(f"Unknown domain: {domain!r}. Available: {available}", file=sys.stderr)
             sys.exit(1)
 
     except KeyboardInterrupt: