diff --git a/gateway/platforms/base.py b/gateway/platforms/base.py
index c07897394a..e2eb2e49f2 100644
--- a/gateway/platforms/base.py
+++ b/gateway/platforms/base.py
@@ -29,7 +29,7 @@ from gateway.session import SessionSource, build_session_key
 
 GATEWAY_SECRET_CAPTURE_UNSUPPORTED_MESSAGE = (
     "Secure secret entry is not supported over messaging. "
-    "Run `hermes setup` or update ~/.hermes/.env locally."
+    "Load this skill in the local CLI to be prompted, or add the key to ~/.hermes/.env manually."
 )
 
 
diff --git a/tests/agent/test_skill_commands.py b/tests/agent/test_skill_commands.py
index 770831e489..2e2ac64ccd 100644
--- a/tests/agent/test_skill_commands.py
+++ b/tests/agent/test_skill_commands.py
@@ -192,7 +192,7 @@ Generate some audio.
                 msg = build_skill_invocation_message("/test-skill", "do stuff")
 
         assert msg is not None
-        assert "hermes setup" in msg.lower()
+        assert "local cli" in msg.lower()
 
     def test_preserves_remaining_remote_setup_warning(self, tmp_path, monkeypatch):
         monkeypatch.setenv("TERMINAL_ENV", "ssh")
diff --git a/tests/gateway/test_platform_base.py b/tests/gateway/test_platform_base.py
index c35aebcf23..8334006fdb 100644
--- a/tests/gateway/test_platform_base.py
+++ b/tests/gateway/test_platform_base.py
@@ -14,7 +14,7 @@ from gateway.platforms.base import (
 class TestSecretCaptureGuidance:
     def test_gateway_secret_capture_message_points_to_local_setup(self):
         message = GATEWAY_SECRET_CAPTURE_UNSUPPORTED_MESSAGE
-        assert "hermes setup" in message.lower()
+        assert "local cli" in message.lower()
         assert "~/.hermes/.env" in message
 
 
diff --git a/tests/tools/test_skills_tool.py b/tests/tools/test_skills_tool.py
index b416adda6c..bd72228aa1 100644
--- a/tests/tools/test_skills_tool.py
+++ b/tests/tools/test_skills_tool.py
@@ -511,7 +511,7 @@ class TestSkillViewSecureSetupOnLoad:
         result = json.loads(raw)
         assert result["success"] is True
         assert called["value"] is False
-        assert "hermes setup" in result["gateway_setup_hint"].lower()
+        assert "local cli" in result["gateway_setup_hint"].lower()
         assert result["content"].startswith("---")
 
 
@@ -845,7 +845,7 @@ class TestSkillViewPrerequisites:
                 raw = skill_view("backend-unknown")
         result = json.loads(raw)
         assert result["success"] is True
-        assert "hermes setup" in result["gateway_setup_hint"].lower()
+        assert "local cli" in result["gateway_setup_hint"].lower()
         assert result["setup_needed"] is True
 
     @pytest.mark.parametrize(
diff --git a/tools/skills_tool.py b/tools/skills_tool.py
index b6355967f4..4186d6283c 100644
--- a/tools/skills_tool.py
+++ b/tools/skills_tool.py
@@ -394,7 +394,7 @@ def _gateway_setup_hint() -> str:
 
         return GATEWAY_SECRET_CAPTURE_UNSUPPORTED_MESSAGE
     except Exception:
-        return "Secure secret entry is not available. Run `hermes setup` or update ~/.hermes/.env locally."
+        return "Secure secret entry is not available. Load this skill in the local CLI to be prompted, or add the key to ~/.hermes/.env manually."
 
 
 def _build_setup_note(