ellf-cli 10.0.0__tar.gz → 10.0.2__tar.gz

{ellf_cli-10.0.0/ellf_cli.egg-info → ellf_cli-10.0.2}/PKG-INFO

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

{ellf_cli-10.0.0 → ellf_cli-10.0.2}/ellf_cli/about.json

@@ -1,7 +1,7 @@
 {
   "title": "Ellf CLI",
   "name": "ellf-cli",
-  "version": "10.0.0",
+  "version": "10.0.2",
   "summary": "Ellf Command Line Interface",
   "uri": "https://prodi.gy",
   "prog": "ellf",

{ellf_cli-10.0.0 → ellf_cli-10.0.2}/ellf_cli/commands/actions.py

@@ -9,7 +9,13 @@ from wasabi import msg
 from ellf_pam_sdk.models import ActionDetail, ActionSummary
 
 from ..cli import cli
-from ..errors import BrokerError, CLIError, EllfError, HTTPXErrors
+from ..errors import (
+    BrokerError,
+    CLIError,
+    EllfError,
+    HTTPXErrors,
+    JobStartRejectedError,
+)
 from ..messages import Messages
 from ..query import delete_job, resolve_action, resolve_recipe, start_job, stop_job
 from ..ui import (
@@ -108,9 +114,17 @@ def create(
     if not no_start:
         try:
             start(action_id, no_wait=no_wait, as_json=as_json)
-        except Exception:
+        except JobStartRejectedError:
+            # The broker rejected the start, so no workload exists and the
+            # PAM record can be safely rolled back.
             auth.client.action.delete(id=action_id)
             raise
+        except Exception:
+            # The job may have been submitted, so keep the record.
+            msg.warn(
+                Messages.E060.format(noun="action", name=action_id, plural="actions")
+            )
+            raise
     return action_id
 
 

{ellf_cli-10.0.0 → ellf_cli-10.0.2}/ellf_cli/commands/agents.py

@@ -9,7 +9,13 @@ from wasabi import msg
 from ellf_pam_sdk.models import AgentDetail, AgentSummary
 
 from ..cli import cli
-from ..errors import BrokerError, CLIError, EllfError, HTTPXErrors
+from ..errors import (
+    BrokerError,
+    CLIError,
+    EllfError,
+    HTTPXErrors,
+    JobStartRejectedError,
+)
 from ..messages import Messages
 from ..query import (
     delete_job,
@@ -115,9 +121,15 @@ def create(
     if not no_start:
         try:
             start(agent_id, no_wait=no_wait, as_json=as_json)
-        except Exception:
+        except JobStartRejectedError:
+            # The broker rejected the start, so no workload exists and the
+            # PAM record can be safely rolled back.
             auth.client.agent.delete(id=agent_id)
             raise
+        except Exception:
+            # The job may have been submitted, so keep the record.
+            msg.warn(Messages.E060.format(noun="agent", name=agent_id, plural="agents"))
+            raise
     return agent_id
 
 

{ellf_cli-10.0.0 → ellf_cli-10.0.2}/ellf_cli/commands/general.py

@@ -128,11 +128,23 @@ def login(
         # below run against the chosen org's api_token, not whatever org
         # the device-flow login happened to land in.
         _select_and_persist_org(auth, org)
+    if claude:
+        # Claude setup needs only the packaged skill assets and the
+        # ellf-core token minted by the device flow above — not the
+        # cluster. Run it before cluster selection so cluster failures
+        # (token mint errors, unreachable broker, no cluster registered)
+        # can't block skill installation.
+        _install_claude_skills()
+        _configure_claude_mcp(auth)
     if not no_cluster:
         try:
             _select_and_persist_cluster(auth, cluster)
             auth.get_cluster_token(force_refresh=True)
-        except EllfError as e:
+        except (EllfError, CLIError, httpx.HTTPError) as e:
+            # httpx transport errors (broker unreachable) and CLIError
+            # (no cluster registered, --cluster not matched) are just as
+            # common as EllfError token failures; all of them should get
+            # the --no-cluster hint instead of a raw traceback.
             err = Messages.E116.format(command=f"{cli.prog} login --no-cluster")
             raise CLIError(err, e)
     print_mutation_result(
@@ -140,9 +152,6 @@ def login(
         Messages.T012,
         as_json=as_json,
     )
-    if claude:
-        _install_claude_skills()
-        _configure_claude_mcp(auth)
 
 
 @cli.command(

{ellf_cli-10.0.0 → ellf_cli-10.0.2}/ellf_cli/commands/services.py

@@ -9,7 +9,13 @@ from wasabi import msg
 from ellf_pam_sdk.models import ServiceDetail, ServiceSummary
 
 from ..cli import cli
-from ..errors import BrokerError, CLIError, EllfError, HTTPXErrors
+from ..errors import (
+    BrokerError,
+    CLIError,
+    EllfError,
+    HTTPXErrors,
+    JobStartRejectedError,
+)
 from ..messages import Messages
 from ..query import (
     delete_job,
@@ -114,9 +120,17 @@ def create(
     if not no_start:
         try:
             start(service_id, no_wait=no_wait, as_json=as_json)
-        except Exception:
+        except JobStartRejectedError:
+            # The broker rejected the start, so no workload exists and the
+            # PAM record can be safely rolled back.
             auth.client.service.delete(id=service_id)
             raise
+        except Exception:
+            # The job may have been submitted, so keep the record.
+            msg.warn(
+                Messages.E060.format(noun="service", name=service_id, plural="services")
+            )
+            raise
     return service_id
 
 

{ellf_cli-10.0.0 → ellf_cli-10.0.2}/ellf_cli/commands/tasks.py

@@ -11,7 +11,13 @@ from wasabi import msg
 from ellf_pam_sdk.models import TaskDetail, TaskSummary
 
 from ..cli import cli
-from ..errors import BrokerError, CLIError, EllfError, HTTPXErrors
+from ..errors import (
+    BrokerError,
+    CLIError,
+    EllfError,
+    HTTPXErrors,
+    JobStartRejectedError,
+)
 from ..messages import Messages
 from ..query import delete_job, resolve_recipe, resolve_task, start_job, stop_job
 from ..ui import (
@@ -116,9 +122,15 @@ def create(
     if not no_start:
         try:
             start(task_id, no_wait=no_wait, as_json=as_json)
-        except Exception:
+        except JobStartRejectedError:
+            # The broker rejected the start, so no workload exists and the
+            # PAM record can be safely rolled back.
             auth.client.task.delete(id=task_id)
             raise
+        except Exception:
+            # The job may have been submitted, so keep the record.
+            msg.warn(Messages.E060.format(noun="task", name=task_id, plural="tasks"))
+            raise
     return task_id
 
 

{ellf_cli-10.0.0 → ellf_cli-10.0.2}/ellf_cli/ellf_skills/skills/ellf-annotate.coding/SKILL.md

@@ -2,6 +2,7 @@
 name: ellf-annotate
 description: "Set up and launch annotation from the coding environment once the methodology, schema, and data are ready. Use when the user wants to start annotation on the Ellf cluster, run a local Prodigy annotation server, choose between built-in Ellf and built-in Prodigy recipes, verify that annotation is ready to launch, preview the annotation setup, or determine whether a new custom recipe is needed. Also trigger on \"I want to annotate\", \"start a local Prodigy server\", \"launch annotation on the cluster\", \"which recipe should I use\", \"can I run this locally\", \"set up review\", or \"help me run annotation\". This skill is the annotation readiness gatekeeper: it applies the audit checklist before launch, prefers built-in workflows when possible, and delegates to `/ellf-prodigy` when a new custom recipe must be implemented."
 argument-hint: "[describe what you want to annotate]"
+allowed-tools: Bash(ellf info defaults:*)
 ---
 
 # Launch Annotation From Coding
@@ -10,6 +11,13 @@ Help the user get from an annotation-ready plan to a working annotation process.
 
 $ARGUMENTS
 
+## Current Ellf session context
+
+The block below is auto-filled from your local Ellf CLI each time this skill loads. Read it instead of trying to discover the project, cluster, or task yourself. There is **no** `ellf project current` / `ellf projects current` command — these saved defaults are what such a command would return, and most `ellf` commands fall back to them automatically. To change one, run `ellf config <project|task|action|agent|...> <name_or_id>`.
+
+Saved CLI defaults:
+!`ellf info defaults`
+
 ## Your role
 
 You are responsible for:

{ellf_cli-10.0.0 → ellf_cli-10.0.2}/ellf_cli/ellf_skills/skills/ellf-monitor.coding/SKILL.md

@@ -2,6 +2,7 @@
 name: ellf-monitor
 description: "Monitors Ellf jobs, local Prodigy servers, training progress, and cluster health — keeps raw logs out of context and produces structured summaries. Includes a structured training check script, alert classification (overfitting, plateau, NaN loss, spikes), annotation metrics, and diagnostic routing. Use proactively after launching any job, not just when the user asks. Also trigger on status checks, log inspection, 'how's the task doing', 'what failed', or training metric questions."
 argument-hint: "[job name, job type, output dir, or 'cluster']"
+allowed-tools: Bash(ellf info defaults:*)
 ---
 
 # Monitor Jobs From Coding
@@ -10,6 +11,13 @@ You are the monitoring and diagnosis skill for the coding environment.
 
 $ARGUMENTS
 
+## Current Ellf session context
+
+The block below is auto-filled from your local Ellf CLI each time this skill loads. Read it instead of trying to discover the project, cluster, or task yourself. There is **no** `ellf project current` / `ellf projects current` command — these saved defaults are what such a command would return, and most `ellf` commands fall back to them automatically. To change one, run `ellf config <project|task|action|agent|...> <name_or_id>`.
+
+Saved CLI defaults:
+!`ellf info defaults`
+
 ## Contents
 - Scope — what this skill does and doesn't do
 - Monitoring surfaces — cluster jobs, local runs, Prodigy servers, cluster health

{ellf_cli-10.0.0 → ellf_cli-10.0.2}/ellf_cli/ellf_skills/skills/ellf-ops.coding/SKILL.md

@@ -2,6 +2,7 @@
 name: ellf-ops
 description: "Executes Ellf operations from the coding environment: creating, starting, stopping, or inspecting tasks, actions, or agents; managing assets, datasets, files, secrets, or packages; publishing data or code; managing projects, path aliases, or cluster health. Includes verification rules, failure handling workflows, and secret management guidance. Use --help on recipes to discover args, then follow the workflows for execution and verification."
 argument-hint: "[ready launch spec or job operation]"
+allowed-tools: Bash(ellf info defaults:*)
 ---
 
 # Execute Operations From Coding
@@ -10,6 +11,13 @@ You are the execution skill for operational workflows in the coding environment.
 
 $ARGUMENTS
 
+## Current Ellf session context
+
+The block below is auto-filled from your local Ellf CLI each time this skill loads. Read it instead of trying to discover the project, cluster, task, action, or agent yourself. There is **no** `ellf project current` / `ellf projects current` command — these saved defaults are what such a command would return, and most `ellf` commands fall back to them automatically. To change one, run `ellf config <project|task|action|agent|...> <name_or_id>`.
+
+Saved CLI defaults:
+!`ellf info defaults`
+
 ## Scope
 
 You execute ready operations. You do not:

{ellf_cli-10.0.0 → ellf_cli-10.0.2}/ellf_cli/ellf_skills/skills/ellf-prodigy/SKILL.md

@@ -2,6 +2,7 @@
 name: ellf-prodigy
 description: Develop and test custom Prodigy annotation recipes — both standalone Prodigy and Ellf. Has templates, API reference, built-in recipe catalog, and a lint script. Use when the user needs a custom recipe built, wants to edit or fix recipe code, asks about "recipe.py", "custom annotation workflow", or any request to write/modify/troubleshoot Prodigy recipe Python code. Also trigger for porting standalone recipes to Ellf or vice versa.
 argument-hint: "[describe your annotation task or recipe to edit]"
+allowed-tools: Bash(ellf info defaults:*), Bash(ellf plans list:*)
 ---
 
 # Prodigy Recipe Developer
@@ -10,6 +11,16 @@ You develop and test custom Prodigy annotation recipes.
 
 $ARGUMENTS
 
+## Current Ellf session context
+
+The block below is auto-filled from your local Ellf CLI each time this skill loads. Read it instead of trying to discover the project or other defaults yourself. There is **no** `ellf project current` / `ellf projects current` command — these saved defaults are what such a command would return, and most `ellf` commands fall back to them automatically. To change one, run `ellf config <project|task|action|agent|...> <name_or_id>`.
+
+Saved CLI defaults:
+!`ellf info defaults`
+
+Plans in the saved project (`ellf plans list` and the other `ellf plans` commands default to it):
+!`ellf plans list`
+
 ## Setup
 
 This is a coding-only skill. Work from the local coding environment and current
@@ -36,9 +47,10 @@ current codebase, and existing recipe package structure.
    every task needs a custom recipe. If they still want custom, understand what
    the built-in is missing.
 
-2. **Check the shared project plan** using the current local project context.
-   Extract task type, labels, data source, runtime target, and any recipe
-   recommendations already agreed elsewhere.
+2. **Check the shared project plan.** The injected "Current Ellf session context"
+   above lists the plans in the saved project — read the relevant one with
+   `ellf plans read` (it defaults to the saved project). Extract task type, labels,
+   data source, runtime target, and any recipe recommendations already agreed elsewhere.
 
 3. **Gather requirements** you don't already have: annotation task type, labels,
    data source, model assistance (manual / model-correct / active learning /

{ellf_cli-10.0.0 → ellf_cli-10.0.2}/ellf_cli/ellf_skills/skills/ellf-project.coding/SKILL.md

@@ -2,6 +2,7 @@
 name: ellf-project
 description: Plan an NLP project end-to-end with an opinionated consultant. Covers problem framing, data strategy, annotation, pipeline design, evaluation, and deployment planning, grounded in spaCy, Prodigy, Ellf workflows and applied NLP best practices. Use whenever the user asks how to approach an NLP task, needs help deciding between rules, ML, and LLMs, wants advice on label scheme design, needs pipeline architecture guidance, asks how to break a vague NLP problem into concrete steps, or says things like "how should I build this", "what's the best approach for", "help me plan", "I need to extract/classify/annotate", "how do I structure this project", or "what should I do next". Also trigger when the user seems unsure about their NLP approach, has a vague requirement that needs scoping, or needs a shared project plan created or updated.
 argument-hint: "[describe your NLP problem]"
+allowed-tools: Bash(ellf info defaults:*), Bash(ellf plans list:*)
 ---
 
 # NLP Project Consultant
@@ -13,6 +14,16 @@ You do not dump generic questionnaires. You listen, react, recommend, and ask th
 
 $ARGUMENTS
 
+## Current Ellf session context
+
+The block below is auto-filled from your local Ellf CLI each time this skill loads. Read it instead of trying to discover the project or other defaults yourself. There is **no** `ellf project current` / `ellf projects current` command — these saved defaults are what such a command would return, and most `ellf` commands fall back to them automatically. To change one, run `ellf config <project|task|action|agent|...> <name_or_id>`.
+
+Saved CLI defaults:
+!`ellf info defaults`
+
+Plans in the saved project (`ellf plans list` and the other `ellf plans` commands default to it):
+!`ellf plans list`
+
 ## Contents
 - Your role — planning, not implementation
 - Shared project plan — local CLI plan access and lifecycle
@@ -65,7 +76,7 @@ In the coding environment, use the local `ellf plans` workflow. `<project_id>` i
 - `ellf plans revisions <name_or_id> [<project_id>] [--size N] [--after <cursor>]` — paginated history of one plan, newest first. `name_or_id` is required here (no default).
 - `ellf plans delete <name_or_id> [<project_id>]` — delete a plan by name or UUID.
 
-If you need to resolve the current project ID first, use the local project context before reading or writing plans. Do not guess the project ID.
+The `ellf plans` commands already default to the saved project when `<project_id>` is omitted, so you usually don't need to resolve it. If you do need the current project ID explicitly, read it from `ellf info defaults` (the `project` field). Do not guess the project ID, and note there is no `ellf project`/`ellf projects current` command — use `ellf info defaults` to read the saved default and `ellf config project <name_or_id>` to change it.
 
 Do not ask the user where to store the plan.
 

{ellf_cli-10.0.0 → ellf_cli-10.0.2}/ellf_cli/ellf_skills/skills/ellf-support.coding/SKILL.md

@@ -2,6 +2,7 @@
 name: ellf-support
 description: Prepare and send a support request from the coding environment when the user wants human help from the Ellf team. Use when the user wants to escalate an issue, asks for human review, wants to contact support, or says things like "I need support", "can someone look at this", "send this to the Ellf team", or "I'm stuck". This skill gathers the issue, summarizes the current state, asks whether to attach the full Claude Code transcript, and sends the request with `ellf support create`.
 argument-hint: "[describe your issue]"
+allowed-tools: Bash(ellf info defaults:*)
 ---
 
 # Human Support From Coding
@@ -10,6 +11,13 @@ Help the user escalate to human support cleanly and accurately.
 
 $ARGUMENTS
 
+## Current Ellf session context
+
+The block below is auto-filled from your local Ellf CLI each time this skill loads. Use the saved `project` here as the default target for the support request — do not try to discover it with `ellf project current` / `ellf projects current` (no such command). If the saved project looks wrong or stale for this request, fall back to `ellf projects list --json` and confirm with the user (see "Resolve the target project" below).
+
+Saved CLI defaults:
+!`ellf info defaults`
+
 ## Scope
 
 You are not implementing a fix here. Your job is to:
@@ -57,8 +65,8 @@ Use the current conversation first.
 
 Resolve the target project before you submit the request.
 
-- If the current project is explicit from local project context or prior confirmed
-  state, use it.
+- If the current project is explicit (the saved `project` in the injected session
+  context above, or prior confirmed state), use it.
 - If there is any ambiguity about which project the support request belongs to,
   use `ellf projects list --json` to gather candidates, then use `AskUserQuestion`
   to confirm the project with the user before running `ellf support create`.

{ellf_cli-10.0.0 → ellf_cli-10.0.2}/ellf_cli/ellf_skills/skills/ellf-train.coding/SKILL.md

@@ -2,6 +2,7 @@
 name: ellf-train
 description: "Trains spaCy models locally or on the Ellf cluster — from config generation and experiment design through training execution to result interpretation and troubleshooting. Covers architecture selection, model selection, training diagnostics, and evaluation methodology. Use whenever training is about to happen: creating a training action, choosing a base model, generating a config, designing experiments, interpreting scores, or debugging training problems. Also trigger on training curves, loss values, F-scores, or 'my model isn't learning'."
 argument-hint: "[describe what you want to train, or provide a dataset name]"
+allowed-tools: Bash(ellf info defaults:*), Bash(ellf plans list:*)
 ---
 
 # NLP Model Training
@@ -10,11 +11,21 @@ You help users go from annotated data to a trained spaCy model — locally or on
 
 $ARGUMENTS
 
+## Current Ellf session context
+
+The block below is auto-filled from your local Ellf CLI each time this skill loads. Read it instead of trying to discover the project or other defaults yourself. There is **no** `ellf project current` / `ellf projects current` command — these saved defaults are what such a command would return, and most `ellf` commands fall back to them automatically. To change one, run `ellf config <project|task|action|agent|...> <name_or_id>`.
+
+Saved CLI defaults:
+!`ellf info defaults`
+
+Plans in the saved project (`ellf plans list` and the other `ellf plans` commands default to it):
+!`ellf plans list`
+
 ## Setup
 
 1. **Read `${CLAUDE_SKILL_DIR}/references/workflow.md`** — this is your decision flowchart. It tells you where you are in the training process and what to do next. Read it on every invocation.
 
-2. **Check for a shared project plan** using the current project context. Read the current plan with the local `ellf plans` commands and extract training-relevant context such as task type, labels, data decisions, prior architecture choices, and any previous launch decisions.
+2. **Check for a shared project plan.** The injected "Current Ellf session context" above already lists the plans in the saved project — pick the relevant one and read it with `ellf plans read` (it defaults to the saved project, so you don't resolve a project ID first). Extract training-relevant context such as task type, labels, data decisions, prior architecture choices, and any previous launch decisions.
 
 3. **Check for `training_history.md`** in the working directory. If found, the Current Status section tells you where things stand. Resume from there.
 

{ellf_cli-10.0.0 → ellf_cli-10.0.2}/ellf_cli/errors.py

@@ -61,6 +61,16 @@ class CLIError(Exception):
         super().__init__(self.message)
 
 
+class JobStartRejectedError(CLIError):
+    """The broker rejected a job start outright, so no workload was created.
+
+    Raised only when the broker's start response reports a cluster or
+    validation error. Other start failures (e.g. status polling after the
+    job was submitted) must not use this class: the workload may be running,
+    so it is not safe to roll back the PAM record.
+    """
+
+
 class EllfParseSecretsError(EllfError):
     def __init__(
         self, secrets_file: Path | None, error: Exception | None = None

{ellf_cli-10.0.0 → ellf_cli-10.0.2}/ellf_cli/messages.py

@@ -63,6 +63,7 @@ ellf secret create my-credentials OPENAI_API_KEY="sk-..." CUSTOM_SECRET=-
     E057 = "Could not import recipes from {package}"
     E058 = "Could not get a Prodigy login token from the broker for task {name}"
     E059 = "Could not fetch questions from the task server for {name}"
+    E060 = "Could not confirm that {noun} {name} started. The {noun} was created and still exists: check it with `ellf {plural} info {name}` or start it with `ellf {plural} start {name}`"
 
     T001 = "Not creating {noun} {name}: {noun} already exists"
     T002 = "Successfully created {noun} {name}"

{ellf_cli-10.0.0 → ellf_cli-10.0.2}/ellf_cli/query.py

@@ -22,7 +22,7 @@ from ellf_pam_sdk.errors import ELLF_ERRORS, EllfError
 
 from .auth import AuthState
 from .commands._state import get_auth_state, get_root_cfg, get_saved_settings
-from .errors import CLIError, EllfErrors
+from .errors import CLIError, EllfErrors, JobStartRejectedError
 from .messages import Messages
 from .ty import Page
 from .util import URL
@@ -603,10 +603,10 @@ class JobOperations:
             return
         elif change_response.cluster_error:
             err = Messages.E025.format(noun=self.job_type.value, name=job_spec.job_id)
-            raise CLIError(err, change_response.cluster_error)
+            raise JobStartRejectedError(err, change_response.cluster_error)
         elif change_response.validation_error:
             err = Messages.E044.format(noun=self.job_type.value, name=job_spec.job_id)
-            raise CLIError(err, change_response.validation_error)
+            raise JobStartRejectedError(err, change_response.validation_error)
         elif not quiet:
             msg.info(
                 Messages.T006.format(noun=self.job_type.value, name=job_spec.job_id)

{ellf_cli-10.0.0 → ellf_cli-10.0.2/ellf_cli.egg-info}/PKG-INFO

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

{ellf_cli-10.0.0 → ellf_cli-10.0.2}/tests/test_login.py

@@ -156,6 +156,64 @@ def test_install_claude_skills_with_packaged_plugin(tmp_path, monkeypatch):
     assert (dest / "ellf-patterns").is_dir()
 
 
+def _patch_login_collaborators(monkeypatch, *, cluster_error=None):
+    """Patch login()'s collaborators so it can run without network access.
+
+    Returns (auth, install_mock, configure_mock). When ``cluster_error``
+    is given, cluster selection raises it.
+    """
+    from ellf_cli.commands import general
+
+    auth = MagicMock()
+    monkeypatch.setattr(general, "get_auth_state", lambda: auth)
+    monkeypatch.setattr(general, "_select_and_persist_org", MagicMock())
+    cluster_mock = MagicMock(side_effect=cluster_error)
+    monkeypatch.setattr(general, "_select_and_persist_cluster", cluster_mock)
+    install_mock = MagicMock()
+    configure_mock = MagicMock()
+    monkeypatch.setattr(general, "_install_claude_skills", install_mock)
+    monkeypatch.setattr(general, "_configure_claude_mcp", configure_mock)
+    return auth, install_mock, configure_mock
+
+
+def test_login_claude_installs_skills_despite_cluster_failure(monkeypatch):
+    """Regression: cluster auth failure must not block Claude skill setup.
+
+    Skill install and MCP config only need the device-flow tokens, so
+    they run before cluster selection and survive any cluster error.
+    """
+    import pytest
+
+    from ellf_cli.commands import general
+    from ellf_cli.errors import CLIError, EllfError
+
+    auth, install_mock, configure_mock = _patch_login_collaborators(
+        monkeypatch, cluster_error=EllfError("cluster token mint failed")
+    )
+
+    with pytest.raises(CLIError):
+        general.login(claude=True)
+
+    install_mock.assert_called_once_with()
+    configure_mock.assert_called_once_with(auth)
+
+
+def test_login_wraps_transport_and_cli_errors_with_no_cluster_hint(monkeypatch):
+    """Broker-unreachable (httpx) and no-cluster (CLIError) failures get the
+    same --no-cluster hint as EllfError instead of a raw traceback."""
+    import httpx
+    import pytest
+
+    from ellf_cli.commands import general
+    from ellf_cli.errors import CLIError
+
+    for error in (httpx.ConnectError("connection refused"), CLIError("no clusters")):
+        _patch_login_collaborators(monkeypatch, cluster_error=error)
+        with pytest.raises(CLIError) as exc_info:
+            general.login()
+        assert "--no-cluster" in str(exc_info.value)
+
+
 def _fake_membership(org_id, org_name="acme"):
     return SimpleNamespace(
         org_id=org_id,