fix(cli): preserve service-stop hint endpoint

Author: Wangmerlyn

AGENTS.md

@@ -259,9 +259,10 @@ This file defines how coding agents should work in this repository.
   objects for invalid endpoints, not tracebacks.
 - `keep-gpu start` follow-up status/stop/service-stop hints must target the
   selected service endpoint while keeping default-endpoint hints concise.
-- CLI failure/recovery hints that tell users to run `keep-gpu serve` or
-  `keep-gpu service-stop --force` must likewise target the selected service
-  endpoint while keeping default-endpoint hints concise.
+- CLI failure/recovery hints that tell users to run `keep-gpu serve`,
+  `keep-gpu stop --all`, or `keep-gpu service-stop --force` must likewise
+  target the selected service endpoint while keeping default-endpoint hints
+  concise.
 - Shared public endpoint validation belongs in
   `src/keep_gpu/utilities/endpoint_validation.py`; CLI and MCP entry points
   should only translate those `ValueError`s into their interface-specific error

src/keep_gpu/cli.py

@@ -1003,7 +1003,12 @@ def _require_clean_stop_keep_for_service_stop(
         )
 
 
-def _require_no_active_jobs_for_service_stop(status: Dict[str, Any]) -> None:
+def _require_no_active_jobs_for_service_stop(
+    status: Dict[str, Any],
+    *,
+    stop_all_command: str = "keep-gpu stop --all",
+    force_command: str = "keep-gpu service-stop --force",
+) -> None:
     active_jobs = status.get("active_jobs", [])
     if not active_jobs:
         return
@@ -1013,7 +1018,8 @@ def _require_no_active_jobs_for_service_stop(status: Dict[str, Any]) -> None:
     detail = f" Active jobs: {job_ids}." if job_ids else ""
     raise RuntimeError(
         "Tracked keep sessions detected."
-        f"{detail} Stop sessions first (`keep-gpu stop --all`) or re-run with --force."
+        f"{detail} Stop sessions first (`{stop_all_command}`) or re-run with "
+        f"`{force_command}`."
     )
 
 
@@ -1487,7 +1493,15 @@ def service_stop(
                 f"`{service_stop_force_command}`."
             ) from exc
 
-        _require_no_active_jobs_for_service_stop(status)
+        stop_all_command = _keep_gpu_hint_command("stop", host, port, "--all")
+        service_stop_force_command = _keep_gpu_hint_command(
+            "service-stop", host, port, "--force"
+        )
+        _require_no_active_jobs_for_service_stop(
+            status,
+            stop_all_command=stop_all_command,
+            force_command=service_stop_force_command,
+        )
         stop_result = _rpc_call("stop_keep", {}, host, port, timeout=45.0)
         stop_result = _validate_stop_keep_result(stop_result)
         _require_clean_stop_keep_for_service_stop(
@@ -1496,7 +1510,11 @@ def service_stop(
         )
         status = _rpc_call("status", {}, host, port)
         status = _validate_status_result(status, single_job=False)
-        _require_no_active_jobs_for_service_stop(status)
+        _require_no_active_jobs_for_service_stop(
+            status,
+            stop_all_command=stop_all_command,
+            force_command=service_stop_force_command,
+        )
 
         stopped = _stop_service_process(host, port)
         if not stopped:

tests/test_cli_service_commands.py

@@ -3049,6 +3049,40 @@ def test_service_stop_refuses_active_sessions_without_force(monkeypatch):
     assert "Tracked keep sessions detected" in result.output
 
 
+def test_service_stop_active_session_hint_uses_custom_endpoint(monkeypatch):
+    monkeypatch.setattr(cli, "_service_available", lambda *args, **kwargs: True)
+    rpc_methods = []
+
+    def fake_rpc_call(method, params, host, port, timeout=8.0):
+        rpc_methods.append(method)
+        return (
+            {"active_jobs": [{**_status_session_record(), "job_id": "j1"}]}
+            if method == "status"
+            else {"stopped": []}
+        )
+
+    def fail_if_service_process_stops(host, port):
+        raise AssertionError("service-stop must not signal active-session daemons")
+
+    monkeypatch.setattr(cli, "_rpc_call", fake_rpc_call)
+    monkeypatch.setattr(cli, "_stop_service_process", fail_if_service_process_stops)
+
+    result = runner.invoke(
+        cli.app, ["service-stop", "--host", "localhost", "--port", "9999"]
+    )
+
+    normalized_output = " ".join(result.output.split())
+    assert result.exit_code == 1
+    assert "Tracked keep sessions detected" in normalized_output
+    assert "keep-gpu stop --host localhost --port 9999 --all" in normalized_output
+    assert (
+        "keep-gpu service-stop --host localhost --port 9999 --force"
+        in normalized_output
+    )
+    assert "`keep-gpu stop --all`" not in normalized_output
+    assert rpc_methods == ["status"]
+
+
 def test_stop_handles_service_timeout_without_traceback(monkeypatch):
     def fake_rpc(method, params, host, port, timeout=8.0):
         raise cli.ServiceUnreachableError(