magmascript 3.1.0__tar.gz → 3.2.0__tar.gz

{magmascript-3.1.0 → magmascript-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: magmascript
-Version: 3.1.0
+Version: 3.2.0
 Summary: Scripting toolkit with domain-first subcommands
 Author: Jake McCoy
 License-Expression: MIT
@@ -584,6 +584,35 @@ magmascript toast search-index               # Remove search index
 magmascript toast all                        # Clear everything
 ```
 
+### Domains from other packages
+
+A package can publish its own domain by declaring an entry point; it then
+appears in `.mgs` scripts and the REPL without any change to magmascript.
+
+```toml
+# in the other package's pyproject.toml
+[project.entry-points."magmascript.domains"]
+texastoast = "texastoast.mgs:TexastoastDomain"
+```
+
+The value names a class taking a single `config` argument. It is constructed on
+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:
+`pip install texastoast` and `.mgs` scripts can drive a game engine. It
+registers under two names, `texastoast` and the shorter `tt`.
+
+```magmascript
+g = tt.game({"title": "hello", "width": 400, "height": 300})
+```
+
+A package may register the same class under several names this way; nothing
+stops it, and the clients stay independent. Note that none of this touches the
+`magmascript toast` CLI verb, which still clears caches — registry domains are
+not dispatched as subcommands.
+
 ## Python Library
 
 ```python

{magmascript-3.1.0 → magmascript-3.2.0}/README.md

@@ -549,6 +549,35 @@ magmascript toast search-index               # Remove search index
 magmascript toast all                        # Clear everything
 ```
 
+### Domains from other packages
+
+A package can publish its own domain by declaring an entry point; it then
+appears in `.mgs` scripts and the REPL without any change to magmascript.
+
+```toml
+# in the other package's pyproject.toml
+[project.entry-points."magmascript.domains"]
+texastoast = "texastoast.mgs:TexastoastDomain"
+```
+
+The value names a class taking a single `config` argument. It is constructed on
+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:
+`pip install texastoast` and `.mgs` scripts can drive a game engine. It
+registers under two names, `texastoast` and the shorter `tt`.
+
+```magmascript
+g = tt.game({"title": "hello", "width": 400, "height": 300})
+```
+
+A package may register the same class under several names this way; nothing
+stops it, and the clients stay independent. Note that none of this touches the
+`magmascript toast` CLI verb, which still clears caches — registry domains are
+not dispatched as subcommands.
+
 ## Python Library
 
 ```python

{magmascript-3.1.0 → magmascript-3.2.0}/magmascript/__init__.py

@@ -1,6 +1,6 @@
 """magmascript — a scripting toolkit with domain-first subcommands."""
 
-__version__ = "3.1.0"
+__version__ = "3.2.0"
 
 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.1.0 → magmascript-3.2.0}/magmascript/cli.py

@@ -409,17 +409,27 @@ def _dispatch_configure(action: str, args: list[str]):
 Fetch the API key from the MCP server and write to config file.
 
 Options:
-    --host HOST    SSH host to fetch key from (default: jake@192.168.1.16)
+    --host HOST    SSH host to fetch the key from, as user@host (required)
     --help         Show this help
 """)
         sys.exit(0)
 
-    host = "jake@192.168.1.16"
+    host = ""
     if "--host" in args:
         idx = args.index("--host")
         if idx + 1 < len(args):
             host = args[idx + 1]
 
+    if not host:
+        print(
+            "Error: configure needs an explicit SSH target.\n"
+            "  magmascript configure --host user@host\n"
+            "Or set the MCP API key directly: MAGMA_API_KEY in the environment, "
+            "or [mcp] api_key in ~/.config/magmascript/config.toml",
+            file=sys.stderr,
+        )
+        sys.exit(1)
+
     print(f"Fetching API key from {host}...")
 
     try:

{magmascript-3.1.0 → magmascript-3.2.0}/magmascript/core/config.py

@@ -10,6 +10,9 @@ from dataclasses import dataclass, field
 from pathlib import Path
 
 
+# The MCP server is a public endpoint, so it stays a usable default. SSH
+# host/user defaults are intentionally empty — a fresh install must be told
+# which machines to reach rather than probing someone else's network.
 DEFAULT_MCP_URL = "https://magmacrunch.duckdns.org/mcp"
 CONFIG_DIR = Path.home() / ".config" / "magmascript"
 CONFIG_FILE = CONFIG_DIR / "config.toml"
@@ -27,24 +30,24 @@ class MCPConfig:
 class PIConfig:
     """Raspberry Pi SSH configuration."""
 
-    host: str = "192.168.1.16"
-    user: str = "jake"
+    host: str = ""
+    user: str = ""
 
 
 @dataclass
 class MC1Config:
     """MC1 Windows PC SSH configuration."""
 
-    host: str = "100.75.220.87"
-    user: str = "magma"
+    host: str = ""
+    user: str = ""
 
 
 @dataclass
 class MacConfig:
     """Mac SSH configuration (a MacBook on the Tailnet)."""
 
-    host: str = "100.81.70.91"
-    user: str = "jakemccoy"
+    host: str = ""
+    user: str = ""
 
 
 @dataclass
@@ -52,8 +55,8 @@ class GHConfig:
     """GitHub API configuration."""
 
     token: str = ""
-    owner: str = "magmacrunchmedia"
-    repo: str = "magmacrunch.com"
+    owner: str = ""
+    repo: str = ""
 
 
 @dataclass
@@ -146,23 +149,23 @@ def load_config(*, config_path: Path | None = None, env_prefix: str = "MAGMA_")
             or mcp_section.get("api_key", ""),
         ),
         pi=PIConfig(
-            host=os.environ.get(f"{env_prefix}PI_HOST", pi_section.get("host", "192.168.1.16")),
-            user=os.environ.get(f"{env_prefix}PI_USER", pi_section.get("user", "jake")),
+            host=os.environ.get(f"{env_prefix}PI_HOST", pi_section.get("host", "")),
+            user=os.environ.get(f"{env_prefix}PI_USER", pi_section.get("user", "")),
         ),
         mc1=MC1Config(
-            host=os.environ.get(f"{env_prefix}MC1_HOST", mc1_section.get("host", "100.75.220.87")),
-            user=os.environ.get(f"{env_prefix}MC1_USER", mc1_section.get("user", "magma")),
+            host=os.environ.get(f"{env_prefix}MC1_HOST", mc1_section.get("host", "")),
+            user=os.environ.get(f"{env_prefix}MC1_USER", mc1_section.get("user", "")),
         ),
         mac=MacConfig(
-            host=os.environ.get(f"{env_prefix}MAC_HOST", mac_section.get("host", "100.81.70.91")),
-            user=os.environ.get(f"{env_prefix}MAC_USER", mac_section.get("user", "jakemccoy")),
+            host=os.environ.get(f"{env_prefix}MAC_HOST", mac_section.get("host", "")),
+            user=os.environ.get(f"{env_prefix}MAC_USER", mac_section.get("user", "")),
         ),
         gh=GHConfig(
             token=os.environ.get(f"{env_prefix}GH_TOKEN")
             or os.environ.get("GITHUB_TOKEN", "")
             or gh_section.get("token", ""),
-            owner=os.environ.get(f"{env_prefix}GH_OWNER", gh_section.get("owner", "magmacrunchmedia")),
-            repo=os.environ.get(f"{env_prefix}GH_REPO", gh_section.get("repo", "magmacrunch.com")),
+            owner=os.environ.get(f"{env_prefix}GH_OWNER", gh_section.get("owner", "")),
+            repo=os.environ.get(f"{env_prefix}GH_REPO", gh_section.get("repo", "")),
         ),
         media=MediaConfig(
             pexels_key=os.environ.get(f"{env_prefix}PEXELS_KEY", media_section.get("pexels_key", "")),

{magmascript-3.1.0 → magmascript-3.2.0}/magmascript/core/runner.py

@@ -16,8 +16,8 @@ class CommandRunner:
     """Execute shell commands locally or via SSH.
 
     Args:
-        host: Remote host (e.g. "192.168.1.16"). Ignored in local mode.
-        user: Remote user (e.g. "jake"). Ignored in local mode.
+        host: Remote host (e.g. "pi.local" or a Tailscale IP). Ignored in local mode.
+        user: Remote user. Ignored in local mode.
         local: If True, run commands locally via subprocess instead of SSH.
     """
 
@@ -33,6 +33,12 @@ class CommandRunner:
         """
         if self._local:
             return self._local_run(cmd, timeout=timeout)
+        if not self._host:
+            raise SSHError(
+                "no SSH host configured — set the domain's host in "
+                "~/.config/magmascript/config.toml or the MAGMA_*_HOST env var",
+                host="",
+            )
         return self._ssh(cmd, timeout=timeout)
 
     def _local_run(self, cmd: str, *, timeout: int = 15) -> str:

magmascript-3.2.0/magmascript/lang/domain_bridge.py

@@ -0,0 +1,198 @@
+from __future__ import annotations
+
+from dataclasses import fields, is_dataclass
+from typing import Any
+
+from magmascript.core.registry import get_domain, list_domains, register_domain
+
+# Packages outside this repo publish domains under this entry-point group.
+ENTRY_POINT_GROUP = "magmascript.domains"
+
+
+class DomainProxy:
+    """A domain, exposed to scripts under its name.
+
+    The client is built on first use, not at interpreter startup. Every domain
+    used to be constructed for every script and every REPL session, which cost
+    startup time for domains nobody touched and ruled out any domain whose
+    construction does something — opening a window, holding a socket.
+    """
+
+    def __init__(self, name: str, client: Any = None, *,
+                 factory: Any = None) -> None:
+        object.__setattr__(self, "_name", name)
+        object.__setattr__(self, "_factory", factory)
+        object.__setattr__(self, "_client_cache", client)
+
+    @property
+    def _client(self) -> Any:
+        client = object.__getattribute__(self, "_client_cache")
+        if client is None:
+            factory = object.__getattribute__(self, "_factory")
+            if factory is None:
+                name = object.__getattribute__(self, "_name")
+                raise AttributeError(f"domain '{name}' has no client")
+            client = factory()
+            object.__setattr__(self, "_client_cache", client)
+        return client
+
+    def __getattr__(self, name: str) -> Any:
+        if name.startswith("_"):
+            raise AttributeError(name)
+
+        method = getattr(self._client, name, None)
+        if method is None:
+            raise AttributeError(f"'{self._name}' has no method '{name}'")
+
+        def wrapper(*args: Any, **kwargs: Any) -> Any:
+            result = method(*args, **kwargs)
+            return wrap_result(result)
+
+        return wrapper
+
+    def close(self) -> None:
+        # Only a client that was actually built can need closing, and touching
+        # self._client here would construct one just to tear it down.
+        client = object.__getattribute__(self, "_client_cache")
+        if client is not None and hasattr(client, "close"):
+            try:
+                client.close()
+            except Exception:
+                pass
+
+    def __del__(self) -> None:
+        self.close()
+
+    def __repr__(self) -> str:
+        return f"<domain:{self._name}>"
+
+
+class DataclassWrapper:
+    def __init__(self, obj: Any) -> None:
+        object.__setattr__(self, "_obj", obj)
+
+    def __getattr__(self, name: str) -> Any:
+        obj = object.__getattribute__(self, "_obj")
+        if name.startswith("_"):
+            raise AttributeError(name)
+        if is_dataclass(obj) and not isinstance(obj, type):
+            for f in fields(obj):
+                if f.name == name:
+                    return wrap_result(getattr(obj, name))
+        # Not a field, but dataclasses carry properties and methods too, and a
+        # script has no way to tell which is which. InputState.dx and
+        # ControllerState.up are properties over the fields; without this a
+        # script could read the raw buttons byte but not the buttons.
+        try:
+            return wrap_result(getattr(obj, name))
+        except AttributeError:
+            raise AttributeError(
+                f"'{type(obj).__name__}' has no attribute '{name}'"
+            ) from None
+
+    def __repr__(self) -> str:
+        obj = object.__getattribute__(self, "_obj")
+        return repr(obj)
+
+    def __str__(self) -> str:
+        obj = object.__getattribute__(self, "_obj")
+        return str(obj)
+
+
+class ListWrapper:
+    def __init__(self, items: list[Any]) -> None:
+        self._items = [wrap_result(item) for item in items]
+
+    def __getitem__(self, index: int) -> Any:
+        return self._items[index]
+
+    def __len__(self) -> int:
+        return len(self._items)
+
+    def __iter__(self) -> Any:
+        return iter(self._items)
+
+    def __repr__(self) -> str:
+        return repr(self._items)
+
+    def __str__(self) -> str:
+        return str(self._items)
+
+
+def wrap_result(result: Any) -> Any:
+    from magmascript.lang.interpreter import MgsInstance, MgsClass
+    from magmascript.lang.astheno import Fixed, Pine
+    if result is None:
+        return None
+    if isinstance(result, (int, float, str, bool)):
+        return result
+    # Asthenosphere values are dataclasses but are language primitives, not
+    # host objects to be introspected. They must not be wrapped.
+    if isinstance(result, (Fixed, Pine)):
+        return result
+    if callable(result):
+        return result
+    if isinstance(result, (MgsInstance, MgsClass)):
+        return result
+    if isinstance(result, list):
+        return ListWrapper(result)
+    if is_dataclass(result) and not isinstance(result, type):
+        return DataclassWrapper(result)
+    return result
+
+
+def _domain_factory(name: str) -> Any:
+    """Build the thunk that constructs one domain's client on first use.
+
+    A constructor that raises now surfaces at the call that needed it, rather
+    than the domain silently not existing and the script reporting an undefined
+    variable several lines later.
+    """
+
+    def build() -> Any:
+        from magmascript.core.config import get_config
+
+        return get_domain(name)(get_config())
+
+    return build
+
+
+def discover_domains() -> None:
+    """Register domains published by other installed packages.
+
+    A package declares one in its own metadata::
+
+        [project.entry-points."magmascript.domains"]
+        texastoast = "texastoast.mgs:TexastoastDomain"
+
+    which is what lets a domain live in the project it belongs to rather than
+    in this repo. Built-ins win on a name clash, and a broken entry point is
+    skipped rather than taking the interpreter down with it.
+    """
+    from importlib.metadata import entry_points
+
+    try:
+        found = entry_points(group=ENTRY_POINT_GROUP)
+    except Exception:
+        # Broken installed metadata is not this interpreter's problem to solve,
+        # and must not stop a script that uses only built-in domains.
+        return
+
+    builtins = set(list_domains())
+    for entry in found:
+        if entry.name in builtins:
+            continue
+        try:
+            register_domain(entry.name, entry.load())
+        except Exception:
+            # A third-party package that fails to import must not stop a script
+            # that never mentions it from running.
+            continue
+
+
+def create_domain_proxies() -> dict[str, DomainProxy]:
+    discover_domains()
+    return {
+        name: DomainProxy(name, factory=_domain_factory(name))
+        for name in list_domains()
+    }

{magmascript-3.1.0 → magmascript-3.2.0}/magmascript/lang/interpreter.py

@@ -1110,6 +1110,24 @@ class Interpreter:
             obj[node.property] = value
             return value
 
+        # A host object from a domain — a game entity, a config, anything the
+        # bridge handed back. Reading its attributes already works
+        # (exec_PropertyAccess falls through to getattr), so writing them has
+        # to as well, or a script can inspect an object and never change it.
+        if not node.property.startswith("_") and hasattr(obj, node.property):
+            if isinstance(value, astheno.Fixed):
+                # Widths are an Asthenosphere concept. Handing one to a host
+                # object poisons its arithmetic downstream, so store the number.
+                value = value.value
+            try:
+                setattr(obj, node.property, value)
+            except AttributeError as e:
+                raise self.error(
+                    f"Cannot set '{node.property}' on {type(obj).__name__}: {e}",
+                    node,
+                ) from None
+            return value
+
         raise self.error(
             f"Cannot set property on {type(obj).__name__}",
             node,

{magmascript-3.1.0 → magmascript-3.2.0}/magmascript.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: magmascript
-Version: 3.1.0
+Version: 3.2.0
 Summary: Scripting toolkit with domain-first subcommands
 Author: Jake McCoy
 License-Expression: MIT
@@ -584,6 +584,35 @@ magmascript toast search-index               # Remove search index
 magmascript toast all                        # Clear everything
 ```
 
+### Domains from other packages
+
+A package can publish its own domain by declaring an entry point; it then
+appears in `.mgs` scripts and the REPL without any change to magmascript.
+
+```toml
+# in the other package's pyproject.toml
+[project.entry-points."magmascript.domains"]
+texastoast = "texastoast.mgs:TexastoastDomain"
+```
+
+The value names a class taking a single `config` argument. It is constructed on
+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:
+`pip install texastoast` and `.mgs` scripts can drive a game engine. It
+registers under two names, `texastoast` and the shorter `tt`.
+
+```magmascript
+g = tt.game({"title": "hello", "width": 400, "height": 300})
+```
+
+A package may register the same class under several names this way; nothing
+stops it, and the clients stay independent. Note that none of this touches the
+`magmascript toast` CLI verb, which still clears caches — registry domains are
+not dispatched as subcommands.
+
 ## Python Library
 
 ```python

{magmascript-3.1.0 → magmascript-3.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "magmascript"
-version = "3.1.0"
+version = "3.2.0"
 description = "Scripting toolkit with domain-first subcommands"
 readme = "README.md"
 license = "MIT"