ellf-cli 20.0.7__tar.gz → 21.0.1__tar.gz

{ellf_cli-20.0.7/ellf_cli.egg-info → ellf_cli-21.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ellf-cli
-Version: 20.0.7
+Version: 21.0.1
 Summary: Ellf Command Line Interface
 Home-page: https://prodi.gy
 Author: ExplosionAI GmbH

{ellf_cli-20.0.7 → ellf_cli-21.0.1}/README.md

@@ -1679,7 +1679,7 @@ Log in to your Ellf account. You normally don't need to call this manually. It w
 | `--org` | `str` | Name or ID of the organization to log into. If omitted: auto-select when only one is available, or prompt interactively | `None` |
 | `--cluster` | `str` | Name or ID of the cluster to log into. If omitted: auto-select when only one is available, or prompt interactively | `None` |
 | `--json` | `bool` | Output the result as JSON | `False` |
-| `--agent` | `str` | Set up coding agents to work with Ellf: install the Ellf skills and the knowledge base MCP server. One of claude, codex, opencode, copilot; repeat the option or comma-separate them for several | `None` |
+| `--agent` | `str` | Set up coding agents to work with Ellf: install the Ellf skills and the knowledge base MCP server. One of claude, codex, copilot, junie, opencode; repeat the option or comma-separate them for several | `None` |
 | `--claude` | `bool` | Shortcut for --agent claude | `False` |
 
 ### `ellf logout`

{ellf_cli-20.0.7 → ellf_cli-21.0.1}/ellf_cli/agents.py

@@ -12,12 +12,13 @@ from pathlib import Path
 from types import ModuleType
 from typing import Any, Callable, Optional, Union
 
-AGENTS = ("claude", "codex", "opencode", "copilot")
+AGENTS = ("claude", "codex", "copilot", "junie", "opencode")
 AGENT_NAMES = {
     "claude": "Claude Code",
     "codex": "Codex",
-    "opencode": "OpenCode",
     "copilot": "GitHub Copilot",
+    "junie": "Junie",
+    "opencode": "OpenCode",
 }
 MCP_SERVER_NAME = "ellf-kb"
 
@@ -39,6 +40,10 @@ def _copilot_home() -> Path:
     return _env_dir("COPILOT_HOME", _home() / ".copilot")
 
 
+def _junie_home() -> Path:
+    return _env_dir("JUNIE_HOME", _home() / ".junie")
+
+
 def _opencode_config_dir() -> Path:
     return _env_dir("XDG_CONFIG_HOME", _home() / ".config") / "opencode"
 
@@ -55,7 +60,7 @@ def skills_dirs(agent: str) -> list[Path]:
     """The user-level skill directories an agent reads ellf skills from."""
     if agent == "claude":
         return [_home() / ".claude" / "skills"]
-    # Codex, OpenCode and Copilot (CLI and VS Code) all read ~/.agents/skills.
+    # Codex, Copilot (CLI and VS Code), Junie and OpenCode all read ~/.agents/skills.
     dirs = [_home() / ".agents" / "skills"]
     if agent == "copilot" and os.environ.get("COPILOT_HOME"):
         # Copilot CLI stops reading ~/.agents/skills when COPILOT_HOME is set.
@@ -271,6 +276,14 @@ def _configure_copilot_cli(command: list[str]) -> Path:
     return path
 
 
+def _configure_junie(command: list[str]) -> Path:
+    # The Junie CLI and the JetBrains IDE plugin share this file.
+    path = _junie_home() / "mcp" / "mcp.json"
+    entry = {"command": command[0], "args": command[1:]}
+    _set_json_entry(path, ("mcpServers", MCP_SERVER_NAME), entry)
+    return path
+
+
 def _configure_vscode(command: list[str]) -> Optional[Path]:
     # VS Code keeps its own user mcp.json; only touch it when VS Code is there.
     vscode_dir = _vscode_user_dir()
@@ -285,8 +298,9 @@ def _configure_vscode(command: list[str]) -> Optional[Path]:
 _MCP_CONFIGURERS: dict[str, list[Callable[[list[str]], Optional[Path]]]] = {
     "claude": [_configure_claude],
     "codex": [_configure_codex],
-    "opencode": [_configure_opencode],
     "copilot": [_configure_copilot_cli, _configure_vscode],
+    "junie": [_configure_junie],
+    "opencode": [_configure_opencode],
 }
 
 
@@ -328,7 +342,7 @@ _SESSION_ENV_VARS = (
 
 def current_session() -> Optional[AgentSession]:
     """The agent session this process runs in, from the variables agents set
-    for the commands they run. OpenCode sets none.
+    for the commands they run. Junie and OpenCode set none.
 
     An agent started from another agent's shell inherits the outer agent's
     variables too, and nothing says which one is running this command. Rather

{ellf_cli-20.0.7 → ellf_cli-21.0.1}/ellf_cli/commands/infra/_helpers.py

@@ -214,7 +214,41 @@ def k3s_traefik_exists() -> bool:
     return result.returncode == 0
 
 
-def ensure_traefik(public_ip: str = "") -> None:
+def traefik_values(
+    public_ip: str = "", port: int | None = None, tls: bool = False
+) -> dict:
+    """Helm values for the Traefik install. *port* adds an entrypoint for a
+    cluster reached on a port other than 80/443 (e.g. localhost:8443 on
+    Colima, which forwards each port the VM listens on to the same port on
+    the Mac)."""
+    ports: dict = {"web": {"port": 80}, "websecure": {"port": 443}}
+    if port is not None and port not in (80, 443):
+        ports["ellf"] = {
+            "port": port,
+            "exposedPort": port,
+            "expose": {"default": True},
+            "protocol": "TCP",
+            "tls": {"enabled": tls},
+        }
+    values: dict = {
+        "providers": {
+            "kubernetesIngress": {"enabled": True},
+        },
+        "ingressRoute": {"dashboard": {"enabled": False}},
+        "ports": ports,
+        "securityContext": {
+            "capabilities": {"drop": [], "add": ["NET_BIND_SERVICE"]},
+        },
+        "tolerations": SYSTEM_NODE_TOLERATIONS,
+    }
+    if public_ip:
+        values["service"] = {"spec": {"loadBalancerIP": public_ip}}
+    return values
+
+
+def ensure_traefik(
+    public_ip: str = "", port: int | None = None, tls: bool = False
+) -> None:
     """Install or upgrade Traefik via Helm."""
     if k3s_traefik_exists():
         msg.info(
@@ -233,19 +267,7 @@ def ensure_traefik(public_ip: str = "") -> None:
         capture_output=True,
         text=True,
     )
-    values: dict = {
-        "providers": {
-            "kubernetesIngress": {"enabled": True},
-        },
-        "ingressRoute": {"dashboard": {"enabled": False}},
-        "ports": {"web": {"port": 80}, "websecure": {"port": 443}},
-        "securityContext": {
-            "capabilities": {"drop": [], "add": ["NET_BIND_SERVICE"]},
-        },
-        "tolerations": SYSTEM_NODE_TOLERATIONS,
-    }
-    if public_ip:
-        values["service"] = {"spec": {"loadBalancerIP": public_ip}}
+    values = traefik_values(public_ip, port, tls)
     with tempfile.NamedTemporaryFile(mode="w", suffix=".json", delete=False) as tmp:
         tmp.write(json.dumps(values))
         tmp_path = tmp.name

{ellf_cli-20.0.7 → ellf_cli-21.0.1}/ellf_cli/commands/infra/deploy.py

@@ -24,11 +24,14 @@ from ...helm import (
     user_registry_of,
 )
 from ...key_pair import generate_key_pair
+from ...url import URL
 from .._state import get_auth_state
-from ._helpers import create_image_pull_secret, helm_registry_login
+from ._config_io import FILL_IN
+from ._helpers import create_image_pull_secret, ensure_traefik, helm_registry_login
 
 DEFAULT_NAMESPACE = "ellf"
 DEFAULT_RELEASE = "ellf"
+DEFAULT_INGRESS_CLASS = "traefik"
 
 
 @cli.subcommand(
@@ -62,6 +65,18 @@ def deploy(
     # key, wrong type, missing required field) fails right here, before any of
     # the side effects below touch the cluster or PAM.
     overrides = HelmChartOverrides(**values_dict)
+    placeholders = _placeholder_keys(values_dict)
+    if placeholders:
+        msg.fail(
+            f"{values_file} still has FILL-IN placeholders: {', '.join(placeholders)}"
+        )
+        if "registries.user" in placeholders:
+            msg.text(
+                "registries.user is a registry this cluster can push custom "
+                "recipe images to. On a single-node cluster, delete it and set "
+                "localRegistry.enabled: true to use the chart's own registry."
+            )
+        raise SystemExit(1)
     # Image versions are dynamic state owned by PAM's cluster settings.
     # They are injected into the helm invocation here and deliberately
     # never written back to values.yaml.
@@ -166,7 +181,10 @@ def deploy(
                 )
             )
             msg.good("Registered cluster public key with PAM")
-    # 5. Helm upgrade --install
+    # 5. Without an ingress controller nothing serves the cluster's domain.
+    # k3s bundles Traefik, but Colima (and k3s --disable traefik) turn it off.
+    _ensure_ingress_controller(overrides)
+    # 6. Helm upgrade --install
     if chart is None:
         # Use OCI chart from the registry
         if not registry:
@@ -182,7 +200,7 @@ def deploy(
     else:
         msg.info(f"Installing from local chart {chart}...")
         upgrade(chart, overrides, namespace=namespace, wait=wait)
-    # 6. Every worker type pins jobs to nodes labeled ellf/node-class=<node_class>.
+    # 7. Every worker type pins jobs to nodes labeled ellf/node-class=<node_class>.
     # Cloud node pools get that label from terraform; a hand-built cluster (k3s
     # on a workstation) doesn't, and every job then sits Pending with "didn't
     # match Pod's node affinity/selector". Read the types the chart actually
@@ -195,6 +213,55 @@ def deploy(
         preflight_test(release=DEFAULT_RELEASE, namespace=namespace)
 
 
+def _placeholder_keys(values: object, prefix: str = "") -> list[str]:
+    """Dotted paths of the values ``infra init-values`` left as FILL-IN."""
+    if isinstance(values, dict):
+        return [
+            key
+            for name, value in values.items()
+            for key in _placeholder_keys(value, f"{prefix}{name}.")
+        ]
+    if isinstance(values, list):
+        return [
+            key
+            for i, value in enumerate(values)
+            for key in _placeholder_keys(value, f"{prefix}{i}.")
+        ]
+    if isinstance(values, str) and FILL_IN in values:
+        return [prefix.rstrip(".")]
+    return []
+
+
+def _ensure_ingress_controller(overrides: HelmChartOverrides) -> None:
+    """Install Traefik when the chart's IngressClass doesn't exist yet,
+    listening on the cluster domain's port as well as 80/443."""
+    class_name = (
+        overrides.ingress.class_name if overrides.ingress else None
+    ) or DEFAULT_INGRESS_CLASS
+    found = subprocess.run(
+        ["kubectl", "get", "ingressclass", class_name, "-o", "name"],
+        capture_output=True,
+        text=True,
+    )
+    if found.returncode == 0 and found.stdout.strip():
+        return
+    if class_name != DEFAULT_INGRESS_CLASS:
+        msg.warn(
+            f"IngressClass '{class_name}' doesn't exist. Install its ingress "
+            "controller, or nothing will serve the cluster's domain."
+        )
+        return
+    cluster = overrides.cluster
+    port = None
+    tls = False
+    if cluster and cluster.fqdn:
+        domain = URL.parse(f"{cluster.scheme or 'https'}://{cluster.fqdn}")
+        port = domain.port
+        tls = domain.scheme == "https"
+    msg.info("No Traefik IngressClass found; installing Traefik")
+    ensure_traefik(port=port, tls=tls)
+
+
 def _ensure_cluster_keypair_standalone(
     secret_name: str, namespace: str, database_password: str = ""
 ) -> str:

{ellf_cli-20.0.7 → ellf_cli-21.0.1}/ellf_cli/ellf.json

@@ -1,7 +1,7 @@
 {
   "prog": "ellf",
   "help": "Ellf Command Line Interface.",
-  "version": "20.0.7",
+  "version": "21.0.1",
   "extra_key": "_extra",
   "commands": {
     "actions": {
@@ -289,9 +289,9 @@
           "id": "agent",
           "option": "--agent",
           "short": null,
-          "orig_help": "Set up coding agents to work with Ellf: install the Ellf skills and the knowledge base MCP server. One of claude, codex, opencode, copilot; repeat the option or comma-separate them for several",
+          "orig_help": "Set up coding agents to work with Ellf: install the Ellf skills and the knowledge base MCP server. One of claude, codex, copilot, junie, opencode; repeat the option or comma-separate them for several",
           "default": null,
-          "help": "Set up coding agents to work with Ellf: install the Ellf skills and the knowledge base MCP server. One of claude, codex, opencode, copilot; repeat the option or comma-separate them for several (str)",
+          "help": "Set up coding agents to work with Ellf: install the Ellf skills and the knowledge base MCP server. One of claude, codex, copilot, junie, opencode; repeat the option or comma-separate them for several (str)",
           "action": "append",
           "choices": null,
           "has_converter": false,

{ellf_cli-20.0.7 → ellf_cli-21.0.1}/ellf_cli/messages.py

@@ -219,8 +219,8 @@ ellf secret create my-credentials OPENAI_API_KEY="sk-..." CUSTOM_SECRET=-
     login_org = "Name or ID of the organization to log into. If omitted: auto-select when only one is available, or prompt interactively"
     login_agent = (
         "Set up coding agents to work with Ellf: install the Ellf skills and the "
-        "knowledge base MCP server. One of claude, codex, opencode, copilot; repeat "
-        "the option or comma-separate them for several"
+        "knowledge base MCP server. One of claude, codex, copilot, junie, opencode; "
+        "repeat the option or comma-separate them for several"
     )
     claude = "Shortcut for --agent claude"
     use_active_venv = "Use the currently active virtualenv, instead of making a temporary one"

ellf_cli-21.0.1/ellf_cli/version/20.0.7_2026-10-16-07-09-40_major_3e5dfba3-2810-47b4-85a9-938bfff72a04

@@ -0,0 +1,3 @@
+20.0.7
+major
+3e5dfba3-2810-47b4-85a9-938bfff72a04

ellf_cli-21.0.1/ellf_cli/version/21.0.0_2026-10-16-10-44-29_patch_1058e453-613f-492b-a3c7-f3ca2abe8c2d

@@ -0,0 +1,3 @@
+21.0.0
+patch
+1058e453-613f-492b-a3c7-f3ca2abe8c2d

{ellf_cli-20.0.7 → ellf_cli-21.0.1/ellf_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ellf-cli
-Version: 20.0.7
+Version: 21.0.1
 Summary: Ellf Command Line Interface
 Home-page: https://prodi.gy
 Author: ExplosionAI GmbH

{ellf_cli-20.0.7 → ellf_cli-21.0.1}/ellf_cli.egg-info/SOURCES.txt

@@ -336,6 +336,8 @@ ellf_cli/version/20.0.3_2026-10-14-14-29-16_patch_070af1c4-f9d9-4f97-8112-058de9
 ellf_cli/version/20.0.4_2026-10-14-16-20-24_patch_c6672844-8227-4e0a-9fb5-36af7e7141dc
 ellf_cli/version/20.0.5_2026-10-15-08-53-28_patch_10154146-8afd-4632-b250-9b4b9f5bf67c
 ellf_cli/version/20.0.6_2026-10-15-14-17-40_patch_df3a5d3c-f0e0-46cb-aeaf-15b51c8a0f13
+ellf_cli/version/20.0.7_2026-10-16-07-09-40_major_3e5dfba3-2810-47b4-85a9-938bfff72a04
+ellf_cli/version/21.0.0_2026-10-16-10-44-29_patch_1058e453-613f-492b-a3c7-f3ca2abe8c2d
 ellf_cli/version/__init__.py
 ellf_cli/version/read_version.py
 tests/test_agents.py
@@ -354,6 +356,7 @@ tests/test_info.py
 tests/test_infra_config_io.py
 tests/test_infra_configure.py
 tests/test_infra_deploy_node_labels.py
+tests/test_infra_deploy_preflight.py
 tests/test_infra_destroy.py
 tests/test_infra_get_terraform.py
 tests/test_infra_hibernate.py

{ellf_cli-20.0.7 → ellf_cli-21.0.1}/tests/test_agents.py

@@ -19,14 +19,20 @@ SESSION_VARS = (
 @pytest.fixture(autouse=True)
 def home(tmp_path, monkeypatch) -> Path:
     monkeypatch.setattr(Path, "home", lambda: tmp_path)
-    for var in (*SESSION_VARS, "CODEX_HOME", "COPILOT_HOME", "XDG_CONFIG_HOME"):
+    for var in (
+        *SESSION_VARS,
+        "CODEX_HOME",
+        "COPILOT_HOME",
+        "JUNIE_HOME",
+        "XDG_CONFIG_HOME",
+    ):
         monkeypatch.delenv(var, raising=False)
     return tmp_path
 
 
 def test_skills_dirs(home, monkeypatch):
     assert agents.skills_dirs("claude") == [home / ".claude" / "skills"]
-    for agent in ("codex", "opencode", "copilot"):
+    for agent in ("codex", "opencode", "copilot", "junie"):
         assert agents.skills_dirs(agent) == [home / ".agents" / "skills"]
     monkeypatch.setenv("COPILOT_HOME", str(home / "cp"))
     assert agents.skills_dirs("copilot") == [
@@ -210,6 +216,24 @@ class TestCopilotConfig:
         assert "ellf-kb" in json.loads(target.read_text())["mcpServers"]
 
 
+class TestJunieConfig:
+    def test_writes_stdio_server(self, home):
+        path = home / ".junie" / "mcp" / "mcp.json"
+        path.parent.mkdir(parents=True)
+        path.write_text(json.dumps({"mcpServers": {"other": {"url": "x"}}}))
+        assert agents.configure_mcp("junie", CMD) == [path]
+        servers = json.loads(path.read_text())["mcpServers"]
+        assert servers["other"] == {"url": "x"}
+        assert servers["ellf-kb"] == {
+            "command": "/venv/bin/ellf",
+            "args": ["mcp", "kb"],
+        }
+
+    def test_honours_junie_home(self, home, monkeypatch):
+        monkeypatch.setenv("JUNIE_HOME", str(home / "jn"))
+        assert agents.configure_mcp("junie", CMD) == [home / "jn" / "mcp" / "mcp.json"]
+
+
 class TestSessions:
     def test_no_session_outside_agents(self):
         assert agents.current_session() is None

ellf_cli-21.0.1/tests/test_infra_deploy_preflight.py

@@ -0,0 +1,75 @@
+"""What `ellf infra deploy` checks and installs before the chart: no FILL-IN
+placeholders left in values.yaml, and an ingress controller serving the
+cluster's domain (Colima's k3s ships without Traefik)."""
+
+from subprocess import CompletedProcess
+from unittest.mock import patch
+
+from ellf_cli.commands.infra._helpers import traefik_values
+from ellf_cli.commands.infra.deploy import (
+    _ensure_ingress_controller,
+    _placeholder_keys,
+)
+from ellf_cli.helm import HelmChartOverrides
+
+
+def test_placeholder_keys_are_found_at_any_depth():
+    values = {
+        "registries": {"upstream": "r", "user": "FILL-IN-from-terraform-output"},
+        "database": {"ip": "FILL-IN", "user": "cluster_user"},
+        "imagePullSecrets": [{"name": "FILL-IN"}],
+        "networkPolicy": True,
+        "storage": {"hostPath": ""},
+    }
+    assert _placeholder_keys(values) == [
+        "registries.user",
+        "database.ip",
+        "imagePullSecrets.0.name",
+    ]
+
+
+def test_no_extra_entrypoint_on_standard_ports():
+    for port in (None, 80, 443):
+        assert set(traefik_values(port=port)["ports"]) == {"web", "websecure"}
+
+
+def test_entrypoint_on_the_domain_port():
+    ellf = traefik_values(port=8443)["ports"]["ellf"]
+    assert ellf["port"] == ellf["exposedPort"] == 8443
+    assert ellf["tls"] == {"enabled": False}
+    assert traefik_values(port=8443, tls=True)["ports"]["ellf"]["tls"] == {
+        "enabled": True
+    }
+
+
+def _overrides(fqdn: str, scheme: str) -> HelmChartOverrides:
+    return HelmChartOverrides.model_validate(
+        {"cluster": {"fqdn": fqdn, "scheme": scheme}}
+    )
+
+
+def _kubectl(stdout: str):
+    def run(cmd, **kwargs):
+        assert cmd[:3] == ["kubectl", "get", "ingressclass"]
+        return CompletedProcess(cmd, 0 if stdout else 1, stdout=stdout, stderr="")
+
+    return run
+
+
+def test_traefik_is_installed_when_the_cluster_has_none():
+    with (
+        patch("ellf_cli.commands.infra.deploy.subprocess.run", _kubectl("")),
+        patch("ellf_cli.commands.infra.deploy.ensure_traefik") as ensure,
+    ):
+        _ensure_ingress_controller(_overrides("localhost:8443", "http"))
+    ensure.assert_called_once_with(port=8443, tls=False)
+
+
+def test_an_existing_ingress_class_is_left_alone():
+    found = _kubectl("ingressclass.networking.k8s.io/traefik")
+    with (
+        patch("ellf_cli.commands.infra.deploy.subprocess.run", found),
+        patch("ellf_cli.commands.infra.deploy.ensure_traefik") as ensure,
+    ):
+        _ensure_ingress_controller(_overrides("localhost:8443", "http"))
+    ensure.assert_not_called()