Merge pull request #90 from redis/copilot/sub-pr-86-another-one

Fix CLI token show command to exit with code 1 on errors in JSON mode

Author: abrookins

agent_memory_server/cli.py

@@ -501,24 +501,44 @@ async def show_token():
             matching_hashes = [h for h in token_hashes if h.startswith(token_hash)]
 
             if not matching_hashes:
-                if output_format == "text":
+                if output_format == "json":
+                    click.echo(
+                        json.dumps({"error": f"No token found matching '{token_hash}'"})
+                    )
+                    sys.exit(1)
+                else:
                     click.echo(f"No token found matching '{token_hash}'")
-                return None
+                    sys.exit(1)
             if len(matching_hashes) > 1:
-                if output_format == "text":
+                if output_format == "json":
+                    click.echo(
+                        json.dumps(
+                            {
+                                "error": f"Multiple tokens match '{token_hash}'",
+                                "matches": [
+                                    f"{h[:8]}...{h[-8:]}" for h in matching_hashes
+                                ],
+                            }
+                        )
+                    )
+                    sys.exit(1)
+                else:
                     click.echo(f"Multiple tokens match '{token_hash}':")
                     for h in matching_hashes:
                         click.echo(f"  {h[:8]}...{h[-8:]}")
-                return None
+                    sys.exit(1)
             token_hash = matching_hashes[0]
 
         key = Keys.auth_token_key(token_hash)
         token_data = await redis.get(key)
 
         if not token_data:
-            if output_format == "text":
+            if output_format == "json":
+                click.echo(json.dumps({"error": f"Token not found: {token_hash}"}))
+                sys.exit(1)
+            else:
                 click.echo(f"Token not found: {token_hash}")
-            return None
+                sys.exit(1)
 
         try:
             token_info = TokenInfo.model_validate_json(token_data)
@@ -541,13 +561,6 @@ async def show_token():
                 sys.exit(1)
 
     result = asyncio.run(show_token())
-
-    if result is None:
-        if output_format == "json":
-            click.echo(json.dumps({"error": "Token not found or error occurred"}))
-            sys.exit(1)
-        return
-
     token_hash, token_info, status = result
 
     if output_format == "json":

tests/test_token_cli.py

@@ -248,13 +248,74 @@ def test_token_show_command_partial_hash(
     def test_token_show_command_not_found(self, mock_get_redis, mock_redis, cli_runner):
         """Test token show command with non-existent token."""
         mock_get_redis.return_value = mock_redis
-        mock_redis.get.return_value = None
+        mock_redis.smembers.return_value = set()
 
         result = cli_runner.invoke(token, ["show", "nonexistent"])
 
-        assert result.exit_code == 0
+        assert result.exit_code == 1
         assert "No token found matching" in result.output
 
+    @patch("agent_memory_server.cli.get_redis_conn")
+    def test_token_show_command_not_found_json(
+        self, mock_get_redis, mock_redis, cli_runner
+    ):
+        """Test token show command with non-existent token (JSON output)."""
+        mock_get_redis.return_value = mock_redis
+        mock_redis.smembers.return_value = set()
+
+        import json
+
+        result = cli_runner.invoke(token, ["show", "nonexistent", "--format", "json"])
+
+        assert result.exit_code == 1
+        data = json.loads(result.output)
+        assert "error" in data
+        assert "No token found matching" in data["error"]
+
+    @patch("agent_memory_server.cli.get_redis_conn")
+    def test_token_show_command_multiple_matches_json(
+        self, mock_get_redis, mock_redis, cli_runner
+    ):
+        """Test token show command with multiple matches (JSON output)."""
+        mock_get_redis.return_value = mock_redis
+
+        # Create multiple token hashes with same prefix
+        token_hashes = {
+            "test_hash_111111111111111111111111111111",
+            "test_hash_222222222222222222222222222222",
+        }
+
+        mock_redis.smembers.return_value = token_hashes
+
+        import json
+
+        result = cli_runner.invoke(token, ["show", "test_hash", "--format", "json"])
+
+        assert result.exit_code == 1
+        data = json.loads(result.output)
+        assert "error" in data
+        assert "Multiple tokens match" in data["error"]
+        assert "matches" in data
+        assert len(data["matches"]) == 2
+
+    @patch("agent_memory_server.cli.get_redis_conn")
+    def test_token_show_command_token_not_in_redis_json(
+        self, mock_get_redis, mock_redis, cli_runner
+    ):
+        """Test token show command when token not in Redis (JSON output)."""
+        mock_get_redis.return_value = mock_redis
+        mock_redis.get.return_value = None
+
+        import json
+
+        token_hash = "test_hash_123456789012345678901234567890"
+        result = cli_runner.invoke(token, ["show", token_hash, "--format", "json"])
+
+        assert result.exit_code == 1
+        data = json.loads(result.output)
+        assert "error" in data
+        assert "Token not found" in data["error"]
+
     @patch("agent_memory_server.cli.get_redis_conn")
     def test_token_remove_command_with_confirmation(
         self, mock_get_redis, mock_redis, cli_runner